www/gitlab-ce: Update to 14.3.0

Changelog:
https://about.gitlab.com/releases/2021/09/22/gitlab-14-3-released/

4 files changed, 24 insertions, 35 deletions

diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index a943c286e3d3..ea879687e2dc 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2021-08-31 13:57:34 UTC
+--- Gemfile.orig	2021-09-21 10:06:28 UTC
 +++ Gemfile
 @@ -88,7 +88,7 @@ gem 'gpgme', '~> 2.0.19'
  # GitLab fork with several improvements to original library. For full list of changes
@@ -26,16 +26,15 @@
  gem 'connection_pool', '~> 2.0'
  
  # Redis session store
-@@ -332,105 +331,10 @@ gem 'snowplow-tracker', '~> 0.6.1'
+@@ -332,106 +331,10 @@ gem 'snowplow-tracker', '~> 0.6.1'
  
  # Metrics
  gem 'method_source', '~> 1.0', require: false
 -gem 'webrick', '~> 1.6.1', require: false
-+gem 'webrick', '~> 1.6', require: false
- gem 'prometheus-client-mmap', '~> 0.12.0', require: 'prometheus/client'
+ gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client'
  
  gem 'warning', '~> 1.2.0'
--
+ 
 -group :development do
 -  gem 'lefthook', '~> 0.7.0', require: false
 -  gem 'solargraph', '~> 0.43', require: false
@@ -71,7 +70,7 @@
 -  gem 'spring', '~> 2.1.0'
 -  gem 'spring-commands-rspec', '~> 1.0.4'
 -
--  gem 'gitlab-styles', '~> 6.2.0', require: false
+-  gem 'gitlab-styles', '~> 6.3.0', require: false
 -
 -  gem 'haml_lint', '~> 0.36.0', require: false
 -  gem 'bundler-audit', '~> 0.7.0.1', require: false
@@ -130,6 +129,16 @@
 -  # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
 -  gem 'derailed_benchmarks', require: false
 -end
- 
+-
  gem 'octokit', '~> 4.15'
  
+ # https://gitlab.com/gitlab-org/gitlab/issues/207207
+@@ -479,7 +382,7 @@ gem 'gitaly', '~> 14.3.0.pre.rc1'
+ # KAS GRPC protocol definitions
+ gem 'kas-grpc', '~> 0.0.2'
+ 
+-gem 'grpc', '~> 1.30.2'
++gem 'grpc', '~> 1.30'
+ 
+ gem 'google-protobuf', '~> 3.17.1'
+ 
diff --git a/www/gitlab-ce/files/patch-bin_background__jobs__sk b/www/gitlab-ce/files/patch-bin_background__jobs__sk
deleted file mode 100644
index cb91657ec11e..000000000000
--- a/www/gitlab-ce/files/patch-bin_background__jobs__sk
+++ /dev/null
@@ -1,20 +0,0 @@
---- bin/background_jobs_sk.orig	2020-03-27 13:35:17 UTC
-+++ bin/background_jobs_sk
-@@ -14,7 +14,7 @@ warn()
- 
- stop()
- {
--  bundle exec sidekiqctl stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1
-+  bundle exec sidekiqctl stop $sidekiq_pidfile >> $sidekiq_logfile 2>&1
- }
- 
- restart()
-@@ -42,7 +42,7 @@ start_sidekiq()
-     cmd="${cmd} ${chpst} -P"
-   fi
- 
--  ${cmd} bundle exec sidekiq -C "${sidekiq_config}" -e $RAILS_ENV "$@"
-+  ${cmd} bundle exec sidekiq -C "${sidekiq_config}" -e $RAILS_ENV "$@"
- }
- 
- case "$1" in
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example
index 89723cc9c122..fab515d68357 100644
--- a/www/gitlab-ce/files/patch-config_gitlab.yml.example
+++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig	2021-08-23 16:27:44 UTC
+--- config/gitlab.yml.example.orig	2021-09-21 10:06:28 UTC
 +++ config/gitlab.yml.example
-@@ -1123,8 +1123,8 @@ production: &base
+@@ -1128,8 +1128,8 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -11,7 +11,7 @@
          # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
  
    ## Backup settings
-@@ -1171,12 +1171,12 @@ production: &base
+@@ -1184,12 +1184,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -27,7 +27,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -1191,13 +1191,13 @@ production: &base
+@@ -1204,13 +1204,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).
@@ -43,7 +43,7 @@
  
      # The URL to the external KAS API (used by the Kubernetes agents)
      # external_url: wss://kas.example.com
-@@ -1207,13 +1207,13 @@ production: &base
+@@ -1220,13 +1220,13 @@ production: &base
  
    ## GitLab Elasticsearch settings
    elasticsearch:
@@ -59,7 +59,7 @@
  
    ## Webpack settings
    # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1440,7 +1440,7 @@ test:
+@@ -1453,7 +1453,7 @@ test:
          gitaly_address: unix:tmp/tests/gitaly/praefect.socket
  
    gitaly:
diff --git a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
index 700475acbec5..7bf3581974c1 100644
--- a/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
+++ b/www/gitlab-ce/files/patch-config_initializers_1__settings.rb
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig	2021-08-23 16:27:44 UTC
+--- config/initializers/1_settings.rb.orig	2021-09-21 10:06:28 UTC
 +++ config/initializers/1_settings.rb
-@@ -184,11 +184,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
+@@ -185,11 +185,7 @@ Settings.gitlab['url'] ||= Settings.__send__(:build_gi
  Settings.gitlab['user'] ||= 'git'
  # External configuration may cause the ssh user to differ from the GitLab user
  Settings.gitlab['ssh_user'] ||= Settings.gitlab.user