Major upgrade to 13.6.0.

Changelog:
https://about.gitlab.com/releases/2020/11/22/gitlab-13-6-released/

Please note, this version requires ruby 2.7 so do not change the default version of ruby.

www/gitlab-ce/Makefile

@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	gitlab-ce
-PORTVERSION?=	13.5.4
+PORTVERSION?=	13.6.0
-PORTREVISION?=	1
+PORTREVISION?=	0
 CATEGORIES=	www devel
 
 MAINTAINER?=	mfechner@FreeBSD.org
@@ -14,13 +14,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # the rubygems of RUN_DEPENDS matches the order of the Gemfile
 # which makes maintaining this long list much easier!
-# missing: gitlab-kas>=0.0.5:?????
+# missing: gitlab-kas>=13.6.1:net/gitlab-agent \ 
 MY_DEPENDS=	git>=2.26:devel/git \
 	gitaly>=${PORTVERSION}:devel/gitaly \
 	gitlab-elasticsearch-indexer>=2.7.0:textproc/gitlab-elasticsearch-indexer \
-	gitlab-pages>=1.28.0:www/gitlab-pages \
+	gitlab-pages>=1.30.0:www/gitlab-pages \
-	gitlab-shell>=13.11.0:devel/gitlab-shell \
+	gitlab-shell>=13.13.0:devel/gitlab-shell \
-	gitlab-workhorse>=8.51.0:www/gitlab-workhorse \
+	gitlab-workhorse>=8.54.0:www/gitlab-workhorse \
 	redis>=3.2.12:databases/redis \
 	yarn>=1.10.0:www/yarn \
 	gtar>0:archivers/gtar \
@@ -34,7 +34,7 @@ MY_DEPENDS=	git>=2.26:devel/git \
 	rubygem-default_value_for>=3.3.0<3.4.0:devel/rubygem-default_value_for \
 	rubygem-pg>=1.2.3<2:databases/rubygem-pg \
 	rubygem-rugged>=0.28:devel/rubygem-rugged \
-	rubygem-grape-path-helpers>=1.4<2.0:devel/rubygem-grape-path-helpers \
+	rubygem-grape-path-helpers>=1.5<2.0:devel/rubygem-grape-path-helpers \
 	rubygem-faraday>=1.0<2:www/rubygem-faraday \
 	rubygem-marginalia>=1.9.0<1.10:databases/rubygem-marginalia \
 	rubygem-devise-rails60>=4.7.2<4.8:devel/rubygem-devise-rails60 \
@@ -60,7 +60,7 @@ MY_DEPENDS=	git>=2.26:devel/git \
 	rubygem-omniauth-ultraauth>=0.0.2<0.1.0:net/rubygem-omniauth-ultraauth \
 	rubygem-omniauth-salesforce>=1.0.5<1.1.0:net/rubygem-omniauth-salesforce \
 	rubygem-omniauth-atlassian-oauth2>=0.2.0<0.3:security/rubygem-omniauth-atlassian-oauth2 \
-	rubygem-rack-oauth2>=1.9.3<1.10.0:security/rubygem-rack-oauth2 \
+	rubygem-rack-oauth2>=1.16.0<1.17.0:security/rubygem-rack-oauth2 \
 	rubygem-jwt21>=2.1.0<2.2.0:www/rubygem-jwt21 \
 	rubygem-gssapi>0:security/rubygem-gssapi \
 	rubygem-recaptcha>=4.11<5.0:devel/rubygem-recaptcha \
@@ -84,6 +84,7 @@ MY_DEPENDS=	git>=2.26:devel/git \
 	rubygem-graphiql-rails>=1.4.10<1.5.0:devel/rubygem-graphiql-rails \
 	rubygem-apollo_upload_server>=2.0.2<2.1:net/rubygem-apollo_upload_server \
 	rubygem-graphql-docs>=1.6.0<1.7.0:devel/rubygem-graphql-docs \
+	rubygem-graphlient>=0.4.0<0.5:devel/rubygem-graphlient \
 	rubygem-hashie>0:devel/rubygem-hashie \
 	rubygem-hashie-forbidden_attributes>0:devel/rubygem-hashie-forbidden_attributes \
 	rubygem-kaminari-rails60>=1.2.1<2.0:www/rubygem-kaminari-rails60 \
@@ -92,7 +93,7 @@ MY_DEPENDS=	git>=2.26:devel/git \
 	rubygem-mini_magick>=4.10.1<4.11:graphics/rubygem-mini_magick \
 	rubygem-fog-aws>=3.5<4.0:net/rubygem-fog-aws \
 	rubygem-fog-core210=2.1.0:devel/rubygem-fog-core210 \
-	rubygem-fog-google>=1.10<2:net/rubygem-fog-google \
+	rubygem-fog-google>=1.11<2:net/rubygem-fog-google \
 	rubygem-fog-local>=0.6<1.0:net/rubygem-fog-local \
 	rubygem-fog-openstack>=1.0<2.0:net/rubygem-fog-openstack \
 	rubygem-fog-rackspace>=0.1.1<1.2.0:net/rubygem-fog-rackspace \
@@ -122,7 +123,7 @@ MY_DEPENDS=	git>=2.26:devel/git \
 	rubygem-asciidoctor>=2.0.10<2.1.0:textproc/rubygem-asciidoctor \
 	rubygem-asciidoctor-include-ext>=0.3.1<0.4.0:textproc/rubygem-asciidoctor-include-ext \
 	rubygem-asciidoctor-plantuml>=0.0.12<0.1:textproc/rubygem-asciidoctor-plantuml \
-	rubygem-rouge324>=3.24.0<3.25:textproc/rubygem-rouge324 \
+	rubygem-rouge>=3.25.0<3.26:textproc/rubygem-rouge \
 	rubygem-truncato>=0.7.11<0.8.0:textproc/rubygem-truncato \
 	rubygem-bootstrap_form>=4.2.0<4.3.0:devel/rubygem-bootstrap_form \
 	rubygem-nokogiri>=1.10.10<1.11.0:textproc/rubygem-nokogiri \
@@ -130,7 +131,7 @@ MY_DEPENDS=	git>=2.26:devel/git \
 	rubygem-icalendar>=0:devel/rubygem-icalendar \
 	rubygem-diffy>=3.3<4:textproc/rubygem-diffy \
 	rubygem-diff_match_patch>=0.1.0<0.2.0:textproc/rubygem-diff_match_patch \
-	rubygem-rack21>=2.1.4<2.2.0,3:www/rubygem-rack21 \
+	rubygem-rack>=2.2.3<2.3,3:www/rubygem-rack \
 	rubygem-rack-timeout>=0.5.1<0.6:www/rubygem-rack-timeout \
 	rubygem-unicorn>=5.5<6:www/rubygem-unicorn \
 	rubygem-unicorn-worker-killer>=0.4.4<0.5.0:www/rubygem-unicorn-worker-killer \
@@ -168,7 +169,6 @@ MY_DEPENDS=	git>=2.26:devel/git \
 	rubygem-babosa>=1.0.2<1.1.0:textproc/rubygem-babosa \
 	rubygem-loofah>=2.7<3.0:textproc/rubygem-loofah \
 	rubygem-licensee8>=8.9<9.0:devel/rubygem-licensee8 \
-	rubygem-ace-rails-ap>=4.1.0<4.2.0:www/rubygem-ace-rails-ap \
 	rubygem-charlock_holmes>=0.7.7<0.8.0:textproc/rubygem-charlock_holmes \
 	rubygem-mimemagic>=0.3.2<0.4.0:misc/rubygem-mimemagic \
 	rubygem-fast_blank>=0:devel/rubygem-fast_blank \
@@ -186,9 +186,10 @@ MY_DEPENDS=	git>=2.26:devel/git \
 	rubygem-gitlab-license>=1.0<2.0:devel/rubygem-gitlab-license \
 	rubygem-rack-attack>=6.3.0<6.4.0:www/rubygem-rack-attack \
 	rubygem-sentry-raven>=3.0<4.0:devel/rubygem-sentry-raven \
+	rubygem-gitlab-pg_query>=1.3<2:databases/rubygem-gitlab-pg_query \
 	rubygem-premailer-rails-rails60>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails60 \
-	rubygem-gitlab-labkit>=0.12.2<0.12.3:devel/rubygem-gitlab-labkit \
+	rubygem-gitlab-labkit>=0.13.2<0.13.3:devel/rubygem-gitlab-labkit \
-	rubygem-ruby_parser>=3.8<4.0:devel/rubygem-ruby_parser \
+	rubygem-ruby_parser>=3.15<4.0:devel/rubygem-ruby_parser \
 	rubygem-rails-i18n-rails60>=6.0<7.0:devel/rubygem-rails-i18n-rails60 \
 	rubygem-gettext_i18n_rails>=1.8.0<1.9.0:devel/rubygem-gettext_i18n_rails \
 	rubygem-gettext_i18n_rails_js-rails60>=1.3<2.0:devel/rubygem-gettext_i18n_rails_js-rails60 \
@@ -264,7 +265,7 @@ USE_GITLAB=	yes
 GL_ACCOUNT?=	gitlab-org
 GL_PROJECT?=	gitlab-foss
 # Find the here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags
-GL_COMMIT?=	7f5f940041c8d1ee074be96cc64bdccdd95649b1
+GL_COMMIT?=	6317794da29af0bccf95dece5b57b2be2c0977a4
 
 USERS=	git
 GROUPS=	git

www/gitlab-ce/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1605706339
+TIMESTAMP = 1605919638
-SHA256 (gitlab-org-gitlab-foss-7f5f940041c8d1ee074be96cc64bdccdd95649b1_GL0.tar.gz) = 4f4decb41f11313880b203addcd319225405dc2a246d375f670df4cb9471911b
+SHA256 (gitlab-org-gitlab-foss-6317794da29af0bccf95dece5b57b2be2c0977a4_GL0.tar.gz) = 8b98fe71a6894e222cc7c9707db81b95d01a27fa8d82cb17b22eb46ca9d18832
-SIZE (gitlab-org-gitlab-foss-7f5f940041c8d1ee074be96cc64bdccdd95649b1_GL0.tar.gz) = 107695184
+SIZE (gitlab-org-gitlab-foss-6317794da29af0bccf95dece5b57b2be2c0977a4_GL0.tar.gz) = 98747523

www/gitlab-ce/files/patch-Gemfile

@@ -1,4 +1,4 @@
---- Gemfile.orig	2020-10-21 18:16:04 UTC
+--- Gemfile.orig	2020-11-20 12:00:55 UTC
 +++ Gemfile
 @@ -18,7 +18,7 @@ gem 'default_value_for', '~> 3.3.0'
  # Supported DBs
@@ -6,7 +6,7 @@
  
 -gem 'rugged', '~> 0.28'
 +gem 'rugged', '~> 1.0'
- gem 'grape-path-helpers', '~> 1.4'
+ gem 'grape-path-helpers', '~> 1.5'
  
  gem 'faraday', '~> 1.0'
 @@ -27,7 +27,7 @@ gem 'marginalia', '~> 1.9.0'
@@ -23,10 +23,10 @@
  gem 'graphiql-rails', '~> 1.4.10'
  gem 'apollo_upload_server', '~> 2.0.2'
 -gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
+ gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
  
  gem 'hashie'
- # Disable strong_params so that Mash does not respond to :permitted?
+@@ -152,7 +151,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark
-@@ -151,7 +150,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark
  gem 'commonmarker', '~> 0.20'
  gem 'kramdown', '~> 2.3.0'
  gem 'RedCloth', '~> 4.3.2'
@@ -35,7 +35,7 @@
  gem 'org-ruby', '~> 0.9.12'
  gem 'creole', '~> 0.5.0'
  gem 'wikicloth', '0.8.1'
-@@ -237,7 +236,7 @@ gem 'redis-rails', '~> 5.0.2'
+@@ -238,7 +237,7 @@ gem 'redis-rails', '~> 5.0.2'
  gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
  
  # HipChat integration
@@ -44,7 +44,16 @@
  
  # Jira integration
  gem 'jira-ruby', '~> 2.0.0'
-@@ -334,97 +333,6 @@ group :metrics do
+@@ -311,7 +310,7 @@ gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query'
+ gem 'premailer-rails', '~> 1.10.3'
+ 
+ # LabKit: Tracing and Correlation
+-gem 'gitlab-labkit', '0.13.1'
++gem 'gitlab-labkit', '0.13.2'
+ 
+ # I18n
+ gem 'ruby_parser', '~> 3.15', require: false
+@@ -335,94 +334,6 @@ group :metrics do
    # Prometheus
    gem 'prometheus-client-mmap', '~> 0.12.0'
    gem 'raindrops', '~> 0.18'
@@ -80,22 +89,19 @@
 -  # Generate Fake data
 -  gem 'ffaker', '~> 2.10'
 -
--  gem 'spring', '~> 2.0.0'
+-  gem 'spring', '~> 2.1.0'
 -  gem 'spring-commands-rspec', '~> 1.0.4'
 -
--  gem 'gitlab-styles', '~> 4.3.0', require: false
+-  gem 'gitlab-styles', '~> 5.1.0', require: false
--  # Pin these dependencies, otherwise a new rule could break the CI pipelines
--  gem 'rubocop', '~> 0.82.0'
--  gem 'rubocop-performance', '~> 1.5.2'
--  gem 'rubocop-rspec', '~> 1.37.0'
 -
--  gem 'scss_lint', '~> 0.56.0', require: false
+-  gem 'scss_lint', '~> 0.59.0', require: false
--  gem 'haml_lint', '~> 0.34.0', require: false
+-  gem 'haml_lint', '~> 0.36.0', require: false
 -  gem 'bundler-audit', '~> 0.6.1', require: false
 -
 -  gem 'benchmark-ips', '~> 2.3.0', require: false
 -
 -  gem 'knapsack', '~> 1.17'
+-  gem 'crystalball', '~> 0.7.0', require: false
 -
 -  gem 'simple_po_parser', '~> 1.1.2', require: false
 -
@@ -121,7 +127,7 @@
 -group :test do
 -  gem 'fuubar', '~> 2.2.0'
 -  gem 'rspec-retry', '~> 0.6.1'
--  gem 'rspec_profiling', '~> 0.0.5'
+-  gem 'rspec_profiling', '~> 0.0.6'
 -  gem 'rspec-parameterized', require: false
 -
 -  gem 'capybara', '~> 3.33.0'

www/gitlab-ce/files/patch-config_gitlab.yml.example

@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig	2020-10-21 18:16:04 UTC
+--- config/gitlab.yml.example.orig	2020-11-20 12:00:55 UTC
 +++ config/gitlab.yml.example
-@@ -1044,7 +1044,7 @@ production: &base
+@@ -1045,7 +1045,7 @@ production: &base
    # Gitaly settings
    gitaly:
      # Path to the directory containing Gitaly client executables.
@@ -9,7 +9,7 @@
      # Default Gitaly authentication token. Can be overridden per storage. Can
      # be left blank when Gitaly is running locally on a Unix socket, which
      # is the normal way to deploy Gitaly.
-@@ -1062,8 +1062,8 @@ production: &base
+@@ -1063,8 +1063,8 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -20,7 +20,7 @@
          # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
  
    ## Backup settings
-@@ -1109,12 +1109,12 @@ production: &base
+@@ -1110,12 +1110,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -36,7 +36,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -1129,22 +1129,22 @@ production: &base
+@@ -1130,22 +1130,22 @@ production: &base
    workhorse:
      # File that contains the secret key for verifying access for gitlab-workhorse.
      # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app).

www/gitlab-ce/files/patch-lib_support_nginx_gitlab

@@ -1,9 +1,9 @@
---- lib/support/nginx/gitlab.orig	2018-11-21 10:39:57 UTC
+--- lib/support/nginx/gitlab.orig	2020-11-20 12:00:55 UTC
 +++ lib/support/nginx/gitlab
 @@ -19,7 +19,7 @@
  upstream gitlab-workhorse {
    # GitLab socket file,
-   # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket
+   # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/sockets/socket
 -  server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
 +  server unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
  }

www/gitlab-ce/files/patch-lib_support_nginx_gitlab-ssl

@@ -1,9 +1,9 @@
---- lib/support/nginx/gitlab-ssl.orig	2018-11-21 10:39:57 UTC
+--- lib/support/nginx/gitlab-ssl.orig	2020-11-20 12:00:55 UTC
 +++ lib/support/nginx/gitlab-ssl
 @@ -23,7 +23,7 @@
  upstream gitlab-workhorse {
    # GitLab socket file,
-   # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/socket
+   # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/sockets/socket
 -  server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
 +  server unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
  }

www/gitlab-ce/pkg-message

@@ -6,7 +6,7 @@ Gitlab was installed successfully.
 You now need to set up the various components of Gitlab, so please
 follow the instructions in the guide at:
 
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/13.5-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/13.6-freebsd.md
 EOM
   type: install
 }
@@ -20,7 +20,7 @@ EOM
 If you just installed an major upgrade of GitLab, for example you
 switched from 12.6.x to 12.7.x, please follow the instructions in the guide at:
 
-https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/13.4-13.5-freebsd.md
+https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/13.5-13.6-freebsd.md
 
 If you just installed an minor upgrade of GitLab please follow
 the instructions in the guide at: