3 files changed, 31 insertions, 68 deletions
diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile
index b4ba20c6961f..48a9feda0a84 100644
--- a/www/gitlab-ce/files/patch-Gemfile
+++ b/www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
---- Gemfile.orig	2021-05-21 13:24:46 UTC
+--- Gemfile.orig	2021-06-21 15:55:09 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,7 +26,16 @@
  gem 'org-ruby', '~> 0.9.12'
  gem 'creole', '~> 0.5.0'
  gem 'wikicloth', '0.8.1'
-@@ -337,108 +336,13 @@ gem 'snowplow-tracker', '~> 0.6.1'
+@@ -309,7 +308,7 @@ gem 'sentry-raven', '~> 3.1'
+ # and https://github.com/pganalyze/pg_query/pull/213 are
+ # released. gitlab-labkit will need to be updated to use the pg_query
+ # version.
+-gem 'gitlab-pg_query', '~> 2.0.4', require: 'pg_query'
++gem 'pg_query', '~> 2.0.3', require: 'pg_query'
+ 
+ gem 'premailer-rails', '~> 1.10.3'
+ 
+@@ -337,107 +336,12 @@ gem 'snowplow-tracker', '~> 0.6.1'
  # Metrics
  group :metrics do
    gem 'method_source', '~> 1.0', require: false
@@ -35,12 +44,11 @@
  
    # Prometheus
    gem 'prometheus-client-mmap', '~> 0.12.0'
-   gem 'raindrops', '~> 0.18'
  end
  
 -group :development do
 -  gem 'lefthook', '~> 0.7.0', require: false
--  gem 'solargraph', '~> 0.40.4', require: false
+-  gem 'solargraph', '~> 0.42', require: false
 -
 -  gem 'letter_opener_web', '~> 1.4.0'
 -
@@ -97,7 +105,7 @@
 -end
 -
 -group :development, :test, :danger do
--  gem 'gitlab-dangerfiles', '~> 2.0.0', require: false
+-  gem 'gitlab-dangerfiles', '~> 2.1.2', require: false
 -end
 -
 -group :development, :test, :coverage do
@@ -136,12 +144,12 @@
  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'
+@@ -485,7 +389,7 @@ gem 'gitaly', '~> 14.0.0.pre.rc2'
+ # KAS GRPC protocol definitions
+ gem 'kas-grpc', '~> 0.0.2'
  
 -gem 'grpc', '~> 1.30.2'
 +gem 'grpc', '~> 1.30'
  
- gem 'google-protobuf', '~> 3.15.8'
+ gem 'google-protobuf', '~> 3.17.1'
  
diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example
index 9a7bcfa31760..c776e15ee016 100644
--- a/www/gitlab-ce/files/patch-config_gitlab.yml.example
+++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example
@@ -1,15 +1,6 @@
---- config/gitlab.yml.example.orig	2021-05-19 15:44:42 UTC
+--- config/gitlab.yml.example.orig	2021-06-21 15:55:09 UTC
 +++ config/gitlab.yml.example
-@@ -1090,7 +1090,7 @@ production: &base
-   # Gitaly settings
-   gitaly:
-     # Path to the directory containing Gitaly client executables.
--    client_path: /home/git/gitaly
-+    client_path: %%PREFIX%%/share/gitaly/bin
-     # 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.
-@@ -1108,8 +1108,8 @@ production: &base
+@@ -1109,8 +1109,8 @@ production: &base
      # real path not the symlink.
      storages: # You must have at least a `default` storage path.
        default:
@@ -20,7 +11,7 @@
          # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
  
    ## Backup settings
-@@ -1155,12 +1155,12 @@ production: &base
+@@ -1156,12 +1156,12 @@ production: &base
  
    ## GitLab Shell settings
    gitlab_shell:
@@ -36,7 +27,7 @@
  
      # Git over HTTP
      upload_pack: true
-@@ -1175,13 +1175,13 @@ production: &base
+@@ -1176,13 +1176,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 +43,7 @@
  
      # The URL to the external KAS API (used by the Kubernetes agents)
      # external_url: wss://kas.example.com
-@@ -1191,13 +1191,13 @@ production: &base
+@@ -1192,13 +1192,13 @@ production: &base
  
    ## GitLab Elasticsearch settings
    elasticsearch:
@@ -68,3 +59,12 @@
  
    ## Webpack settings
    # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
+@@ -1425,7 +1425,7 @@ test:
+         gitaly_address: unix:tmp/tests/gitaly/praefect.socket
+ 
+   gitaly:
+-    client_path: tmp/tests/gitaly/_build/bin
++    client_path: %%PREFIX%%/share/gitaly/bin
+     token: secret
+   workhorse:
+     secret_file: tmp/gitlab_workhorse_test_secret
diff --git a/www/gitlab-ce/files/patch-config_unicorn.rb.example b/www/gitlab-ce/files/patch-config_unicorn.rb.example
deleted file mode 100644
index 27edbd754706..000000000000
--- a/www/gitlab-ce/files/patch-config_unicorn.rb.example
+++ /dev/null
@@ -1,45 +0,0 @@
---- config/unicorn.rb.example.orig	2021-04-22 21:13:23 UTC
-+++ config/unicorn.rb.example
-@@ -33,12 +33,12 @@ worker_processes 3
- 
- # Help ensure your application will always spawn in the symlinked
- # "current" directory that Capistrano sets up.
--working_directory "/home/git/gitlab" # available in 0.94.0+
-+working_directory "%%PREFIX%%/www/gitlab-ce" # available in 0.94.0+
- 
- # Listen on both a Unix domain socket and a TCP port.
- # If you are load-balancing multiple Unicorn masters, lower the backlog
- # setting to e.g. 64 for faster failover.
--listen "/home/git/gitlab/tmp/sockets/gitlab.socket", :backlog => 1024
-+listen "%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab.socket", :backlog => 1024
- listen "127.0.0.1:8080", :tcp_nopush => true
- 
- # destroy workers after 30 seconds instead of 60 seconds (the default)
-@@ -59,13 +59,13 @@ listen "127.0.0.1:8080", :tcp_nopush => true
- timeout 60
- 
- # feel free to point this anywhere accessible on the filesystem
--pid "/home/git/gitlab/tmp/pids/unicorn.pid"
-+pid "%%PREFIX%%/www/gitlab-ce/tmp/pids/unicorn.pid"
- 
- # By default, the Unicorn logger will write to stderr.
- # Additionally, some applications/frameworks log to stderr or stdout,
- # so prevent them from going to /dev/null when daemonized here:
--stderr_path "/home/git/gitlab/log/unicorn.stderr.log"
--stdout_path "/home/git/gitlab/log/unicorn.stdout.log"
-+stderr_path "%%PREFIX%%/www/gitlab-ce/log/unicorn.stderr.log"
-+stdout_path "%%PREFIX%%/www/gitlab-ce/log/unicorn.stdout.log"
- 
- # Save memory by sharing the application code among multiple Unicorn workers
- # with "preload_app true". See:
-@@ -81,8 +81,8 @@ preload_app true
- # fast LAN.
- check_client_connection false
- 
--require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events"
--require_relative "/home/git/gitlab/lib/gitlab/log_timestamp_formatter.rb"
-+require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/cluster/lifecycle_events"
-+require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/log_timestamp_formatter.rb"
- 
- before_exec do |server|
-   # Signal application hooks that we're about to restart