www/gitlab-ce: Update to 13.12.0.

Changelog:
https://about.gitlab.com/releases/2021/05/22/gitlab-13-12-released/

www/gitlab-ce/Makefile

@@ -1,7 +1,7 @@
 # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org>
 
 PORTNAME=	gitlab-ce
-PORTVERSION=	13.11.4
+PORTVERSION=	13.12.0
 PORTREVISION=	0
 CATEGORIES=	www devel
 
@@ -11,14 +11,14 @@ COMMENT=	Web GUI for managing git repositories
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+#	gitlab-agent>=13.12.0:net/gitlab-agent \
 # the rubygems of RUN_DEPENDS matches the order of the Gemfile
 # which makes maintaining this long list much easier!
 MY_DEPENDS=	git>=2.31.0:devel/git \
 	gitaly>=${PORTVERSION}:devel/gitaly \
-	gitlab-elasticsearch-indexer>=2.9.0:textproc/gitlab-elasticsearch-indexer \
-	gitlab-agent>=13.11.1:net/gitlab-agent \
-	gitlab-pages>=1.38.0:www/gitlab-pages \
-	gitlab-shell>=13.17.0:devel/gitlab-shell \
+	gitlab-elasticsearch-indexer>=2.11.0:textproc/gitlab-elasticsearch-indexer \
+	gitlab-pages>=1.39.0:www/gitlab-pages \
+	gitlab-shell>=13.18.0:devel/gitlab-shell \
 	gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \
 	redis>=6.0.12:databases/redis \
 	yarn>=1.10.0:www/yarn \
@@ -31,9 +31,10 @@ MY_DEPENDS=	git>=2.31.0:devel/git \
 	rubygem-default_value_for>=3.4.0<3.5.0:devel/rubygem-default_value_for \
 	rubygem-pg>=1.2.3<2:databases/rubygem-pg \
 	rubygem-rugged>=1.1<2:devel/rubygem-rugged \
-	rubygem-grape-path-helpers>=1.6.1<1.7:devel/rubygem-grape-path-helpers \
+	rubygem-grape-path-helpers>=1.6.3<1.7:devel/rubygem-grape-path-helpers \
 	rubygem-faraday>=1.0<2:www/rubygem-faraday \
 	rubygem-marginalia>=1.10.0<1.11:databases/rubygem-marginalia \
+	rubygem-declarative_policy>=1.0.0<1.1:security/rubygem-declarative_policy \
 	rubygem-devise47-rails60>=4.7.2<4.8:devel/rubygem-devise47-rails60 \
 	rubygem-bcrypt>=3.1.14<3.2:security/rubygem-bcrypt \
 	rubygem-doorkeeper>=5.5.0.rc2<5.6:security/rubygem-doorkeeper \
@@ -56,7 +57,7 @@ MY_DEPENDS=	git>=2.31.0:devel/git \
 	rubygem-omniauth-twitter>=1.4<2.0:net/rubygem-omniauth-twitter \
 	rubygem-omniauth_crowd>=2.4.0<2.5:devel/rubygem-omniauth_crowd \
 	rubygem-omniauth-authentiq>=0.3.3<0.4.0:net/rubygem-omniauth-authentiq \
-	rubygem-omniauth_openid_connect>=0.3.5<0.4.0:net/rubygem-omniauth_openid_connect \
+	rubygem-gitlab-omniauth-openid-connect>=0.4.0<0.5.0:net/rubygem-gitlab-omniauth-openid-connect \
 	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 \
@@ -79,7 +80,7 @@ MY_DEPENDS=	git>=2.31.0:devel/git \
 	rubygem-gitlab_omniauth-ldap>=2.1.1<2.2.0:net/rubygem-gitlab_omniauth-ldap \
 	rubygem-net-ldap>0.16.3:net/rubygem-net-ldap \
 	rubygem-grape>=1.5.2<1.6:devel/rubygem-grape \
-	rubygem-grape-entity07>=0.7.1<0.8.0,1:devel/rubygem-grape-entity07 \
+	rubygem-grape-entity>=0.9.0<0.10.0,1:devel/rubygem-grape-entity \
 	rubygem-rack-cors>=1.0.6<1.1.0:www/rubygem-rack-cors \
 	rubygem-graphql>=1.11.8<1.12:devel/rubygem-graphql \
 	rubygem-graphiql-rails>=1.4.10<1.5.0:devel/rubygem-graphiql-rails \
@@ -167,7 +168,7 @@ MY_DEPENDS=	git>=2.31.0:devel/git \
 	rubygem-ruby-fogbugz021>=0.2.1<0.3.0:devel/rubygem-ruby-fogbugz021 \
 	rubygem-kubeclient>=4.9.1<4.10.0:www/rubygem-kubeclient \
 	rubygem-sanitize>=5.2.1<6:textproc/rubygem-sanitize \
-	rubygem-babosa>=1.0.2<1.1.0:textproc/rubygem-babosa \
+	rubygem-babosa>=1.0.4<1.1.0:textproc/rubygem-babosa \
 	rubygem-loofah>=2.9.0<3.0:textproc/rubygem-loofah \
 	rubygem-licensee>=9.14.1<9.15:devel/rubygem-licensee \
 	rubygem-charlock_holmes>=0.7.7<0.8.0:textproc/rubygem-charlock_holmes \
@@ -184,12 +185,12 @@ MY_DEPENDS=	git>=2.31.0:devel/git \
 	rubygem-gon-rails60>=6.4.0<6.5:www/rubygem-gon-rails60 \
 	rubygem-request_store>=1.5<2.0:devel/rubygem-request_store \
 	rubygem-base32>=0.3.0<0.4.0:converters/rubygem-base32 \
-	rubygem-gitlab-license>=1.4<2.0:devel/rubygem-gitlab-license \
+	rubygem-gitlab-license>=1.5<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-pg_query>=1.3.0<1.4:databases/rubygem-pg_query \
+	rubygem-pg_query>=2.0.3<2.1:databases/rubygem-pg_query \
 	rubygem-premailer-rails-rails60>=1.10.3<1.11.0:mail/rubygem-premailer-rails-rails60 \
-	rubygem-gitlab-labkit>=0.16.2<0.17:devel/rubygem-gitlab-labkit \
+	rubygem-gitlab-labkit>=0.17.1<0.18:devel/rubygem-gitlab-labkit \
 	rubygem-thrift>=0.14.0:devel/rubygem-thrift \
 	rubygem-ruby_parser>=3.15<4.0:devel/rubygem-ruby_parser \
 	rubygem-rails-i18n-rails60>=6.0<7.0:devel/rubygem-rails-i18n-rails60 \
@@ -222,15 +223,16 @@ MY_DEPENDS=	git>=2.31.0:devel/git \
 	rubygem-sshkey>=2.0<3.0:security/rubygem-sshkey \
 	rubygem-ed25519>=1.2<2.0:security/rubygem-ed25519 \
 	rubygem-bcrypt_pbkdf>=1.0<2.0:security/rubygem-bcrypt_pbkdf \
-	rubygem-gitaly>=13.11.0.pre.rc1<13.12.0:net/rubygem-gitaly \
-	rubygem-grpc130>=1.30.2<1.31:net/rubygem-grpc130 \
-	rubygem-google-protobuf314>=3.14.0<3.15:devel/rubygem-google-protobuf314 \
+	rubygem-spamcheck>=0.1.0<0.2:net/rubygem-spamcheck \
+	rubygem-gitaly>=13.12.0.pre.rc1<13.13.0:net/rubygem-gitaly \
+	rubygem-grpc>=1.30.2<2:net/rubygem-grpc \
+	rubygem-google-protobuf315>=3.15.8<3.16:devel/rubygem-google-protobuf315 \
 	rubygem-toml-rb10>=1.0.0<1.1.0:www/rubygem-toml-rb10 \
 	rubygem-flipper017>=0.17.1<0.18.0:devel/rubygem-flipper017 \
 	rubygem-flipper-active_record017>=0.17.1<0.18.0:databases/rubygem-flipper-active_record017 \
 	rubygem-flipper-active_support_cache_store017>=0.17.1<0.18.0:devel/rubygem-flipper-active_support_cache_store017 \
 	rubygem-unleash>=0.1.5<0.2.0:devel/rubygem-unleash \
-	rubygem-gitlab-experiment>=0.5.3<0.6:devel/rubygem-gitlab-experiment \
+	rubygem-gitlab-experiment>=0.5.4<0.6:devel/rubygem-gitlab-experiment \
 	rubygem-lograge-rails60>=0.11.2<1.0:www/rubygem-lograge-rails60 \
 	rubygem-grape_logging>=1.7<2.0:devel/rubygem-grape_logging \
 	rubygem-gitlab-net-dns>=0.9.1<0.10:dns/rubygem-gitlab-net-dns \
@@ -269,7 +271,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?=	cea3c37b30e6ec5e433248fc0a5549430dcd5864
+GL_COMMIT?=	e1c4542b0f1ad29c1f21bc17de191df99b99b1a3
 
 USERS=	git
 GROUPS=	git

www/gitlab-ce/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1621231102
-SHA256 (gitlab-org-gitlab-foss-cea3c37b30e6ec5e433248fc0a5549430dcd5864_GL0.tar.gz) = b24cea49d1b10d52aea1e9839f7d07d366a9430acb600f7356abea074c46d0b6
-SIZE (gitlab-org-gitlab-foss-cea3c37b30e6ec5e433248fc0a5549430dcd5864_GL0.tar.gz) = 96799005
+TIMESTAMP = 1621967009
+SHA256 (gitlab-org-gitlab-foss-e1c4542b0f1ad29c1f21bc17de191df99b99b1a3_GL0.tar.gz) = a67c1cc5b9c79111f2816bc07d04034542651148b55f10c6e9a13c6fc934fe9f
+SIZE (gitlab-org-gitlab-foss-e1c4542b0f1ad29c1f21bc17de191df99b99b1a3_GL0.tar.gz) = 95961347

www/gitlab-ce/files/patch-Gemfile

@@ -1,6 +1,6 @@
---- Gemfile.orig	2021-04-22 21:13:23 UTC
+--- Gemfile.orig	2021-05-21 13:24:46 UTC
 +++ Gemfile
-@@ -85,7 +85,7 @@ gem 'gpgme', '~> 2.0.19'
+@@ -88,7 +88,7 @@ gem 'gpgme', '~> 2.0.19'
  # GitLab fork with several improvements to original library. For full list of changes
  # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master
  gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
@@ -9,15 +9,15 @@
 
  # API
  gem 'grape', '~> 1.5.2'
-@@ -99,7 +99,6 @@ gem 'graphql', '~> 1.11.8'
+@@ -102,7 +102,6 @@ gem 'graphql', '~> 1.11.8'
  # https://gitlab.com/gitlab-org/gitlab/issues/31747
  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'
-@@ -154,7 +153,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark
+@@ -157,7 +156,7 @@ gem 'github-markup', '~> 1.7.0', require: 'github/mark
  gem 'commonmarker', '~> 0.21'
  gem 'kramdown', '~> 2.3.1'
  gem 'RedCloth', '~> 4.3.2'
@@ -26,7 +26,7 @@
  gem 'org-ruby', '~> 0.9.12'
  gem 'creole', '~> 0.5.0'
  gem 'wikicloth', '0.8.1'
-@@ -334,106 +333,11 @@ gem 'snowplow-tracker', '~> 0.6.1'
+@@ -337,108 +336,13 @@ gem 'snowplow-tracker', '~> 0.6.1'
  # Metrics
  group :metrics do
    gem 'method_source', '~> 1.0', require: false
@@ -36,10 +36,11 @@
    # Prometheus
    gem 'prometheus-client-mmap', '~> 0.12.0'
    gem 'raindrops', '~> 0.18'
--end
--
+ end
+ 
 -group :development do
 -  gem 'lefthook', '~> 0.7.0', require: false
+-  gem 'solargraph', '~> 0.40.4', require: false
 -
 -  gem 'letter_opener_web', '~> 1.4.0'
 -
@@ -53,9 +54,9 @@
 -group :development, :test do
 -  gem 'deprecation_toolkit', '~> 1.5.1', require: false
 -  gem 'bullet', '~> 6.1.3'
--  gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext']
+-  gem 'pry-byebug'
 -  gem 'pry-rails', '~> 0.3.9'
--  gem 'pry-remote'
+-  gem 'pry-shell', '~> 0.4.0'
 -
 -  gem 'awesome_print', require: false
 -
@@ -96,7 +97,7 @@
 -end
 -
 -group :development, :test, :danger do
--  gem 'gitlab-dangerfiles', '~> 1.1.1', require: false
+-  gem 'gitlab-dangerfiles', '~> 2.0.0', require: false
 -end
 -
 -group :development, :test, :coverage do
@@ -110,13 +111,12 @@
 -end
 -
 -group :test do
--  gem 'json-schema', '~> 2.8.0'
 -  gem 'fuubar', '~> 2.2.0'
 -  gem 'rspec-retry', '~> 0.6.1'
 -  gem 'rspec_profiling', '~> 0.0.6'
 -  gem 'rspec-parameterized', require: false
 -
--  gem 'capybara', '~> 3.34.0'
+-  gem 'capybara', '~> 3.35.3'
 -  gem 'capybara-screenshot', '~> 1.0.22'
 -  gem 'selenium-webdriver', '~> 3.142'
 -
@@ -131,6 +131,17 @@
 -
 -  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
 -  gem 'derailed_benchmarks', require: false
- end
- 
+-end
+-
  gem 'octokit', '~> 4.15'
+
+ # https://gitlab.com/gitlab-org/gitlab/issues/207207
+@@ -483,7 +387,7 @@ gem 'spamcheck', '~> 0.1.0'
+ # Gitaly GRPC protocol definitions
+ gem 'gitaly', '~> 13.12.0.pre.rc1'
+
+-gem 'grpc', '~> 1.30.2'
++gem 'grpc', '~> 1.30'
+
+ gem 'google-protobuf', '~> 3.15.8'
+

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

@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig	2021-04-22 21:13:23 UTC
+--- config/gitlab.yml.example.orig	2021-05-19 15:44:42 UTC
 +++ config/gitlab.yml.example
-@@ -1084,7 +1084,7 @@ production: &base
+@@ -1090,7 +1090,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.
-@@ -1102,8 +1102,8 @@ production: &base
+@@ -1108,8 +1108,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
-@@ -1149,12 +1149,12 @@ production: &base
+@@ -1155,12 +1155,12 @@ production: &base
 
    ## GitLab Shell settings
    gitlab_shell:
@@ -36,7 +36,7 @@
 
      # Git over HTTP
      upload_pack: true
-@@ -1169,13 +1169,13 @@ production: &base
+@@ -1175,13 +1175,13 @@ 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).
@@ -52,7 +52,7 @@
 
      # The URL to the external KAS API (used by the Kubernetes agents)
      # external_url: wss://kas.example.com
-@@ -1185,13 +1185,13 @@ production: &base
+@@ -1191,13 +1191,13 @@ production: &base
 
    ## GitLab Elasticsearch settings
    elasticsearch:

www/gitlab-ce/files/patch-config_puma.rb.example

@@ -1,4 +1,4 @@
---- config/puma.rb.example.orig	2021-01-21 15:00:14 UTC
+--- config/puma.rb.example.orig	2021-05-19 15:44:42 UTC
 +++ config/puma.rb.example
 @@ -5,11 +5,11 @@
  # The default is "config.ru".
@@ -32,8 +32,8 @@
 
  on_restart do
    # Signal application hooks that we're about to restart
-@@ -80,7 +80,7 @@ if defined?(nakayoshi_fork)
- end
+@@ -76,7 +76,7 @@ wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LES
+ nakayoshi_fork unless ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] == 'true'
 
  # Use json formatter
 -require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"