From 57b415a5edae7c420ba2341223c480d48bf5acf7 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Sun, 25 Oct 2020 00:47:17 +0530
Subject: [PATCH] Refresh patches

---
 debian/patches/0050-relax-stable-libs.patch   | 77 ++++++++---------
 .../0100-remove-development-test.patch        |  8 +-
 ...0-make-test-dependencies-conditional.patch |  4 +-
 debian/patches/0340-relax-httparty.patch      |  2 +-
 debian/patches/0350-relax-method-source.patch |  4 +-
 debian/patches/0350-relax-rdoc.patch          |  2 +-
 .../patches/0430-remove-gitlab-markup.patch   |  2 +-
 debian/patches/0440-remove-unicorn.patch      |  2 +-
 .../0480-embed-elasticsearch-model.patch      |  4 +-
 .../0480-embed-elasticsearch-rails.patch      |  6 +-
 ...ed-faraday-middleware-aws-signers-v4.patch | 16 ----
 debian/patches/0482-remove-ee-only-gems.patch |  2 +-
 .../0485-relax-gitlab-sidekiq-fetcher.patch   |  4 +-
 debian/patches/0486-relax-sidekiq.patch       |  4 +-
 debian/patches/0487-relax-browser.patch       | 41 ---------
 .../0510-remove-dev-dependencies.patch        | 15 ++--
 ...0520-add-system-lib-path-for-webpack.patch |  2 +-
 .../patches/0740-use-packaged-modules.patch   | 44 +++++-----
 debian/patches/0790-protobuf-compat.patch     | 20 -----
 debian/patches/0791-aws-sdk-v3.patch          | 85 -------------------
 debian/patches/series                         |  4 -
 21 files changed, 89 insertions(+), 259 deletions(-)
 delete mode 100644 debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch
 delete mode 100644 debian/patches/0487-relax-browser.patch
 delete mode 100644 debian/patches/0790-protobuf-compat.patch
 delete mode 100644 debian/patches/0791-aws-sdk-v3.patch

diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch
index 3c4008ff0c..e71e4f1665 100644
--- a/debian/patches/0050-relax-stable-libs.patch
+++ b/debian/patches/0050-relax-stable-libs.patch
@@ -56,8 +56,8 @@ gitlab Gemfile
 -gem 'omniauth-shibboleth', '~> 1.3.0'
 +gem 'omniauth-shibboleth', '~> 1.3'
  gem 'omniauth-twitter', '~> 1.4'
--gem 'omniauth_crowd', '~> 2.2.0'
-+gem 'omniauth_crowd', '~> 2.2'
+-gem 'omniauth_crowd', '~> 2.4.0'
++gem 'omniauth_crowd', '~> 2.4'
  gem 'omniauth-authentiq', '~> 0.3.3'
  gem 'omniauth_openid_connect', '~> 0.3.5'
 -gem 'omniauth-salesforce', '~> 1.0.5'
@@ -89,7 +89,7 @@ gitlab Gemfile
  gem 'acme-client', '~> 2.0', '>= 2.0.6'
  
 @@ -72,12 +72,12 @@
- gem 'browser', '~> 2.5'
+ gem 'browser', '~> 4.2'
  
  # GPG
 -gem 'gpgme', '~> 2.0.19'
@@ -142,7 +142,7 @@ gitlab Gemfile
  gem 'fog-google', '~> 1.10'
  gem 'fog-local', '~> 0.6'
  gem 'fog-openstack', '~> 1.0'
-@@ -127,7 +127,7 @@
+@@ -128,7 +128,7 @@
  gem 'unf', '~> 0.1.4'
  
  # Seed data
@@ -151,7 +151,7 @@ gitlab Gemfile
  
  # Search
  gem 'elasticsearch-model', '~> 6.1'
-@@ -138,23 +138,23 @@
+@@ -141,23 +141,23 @@
  
  # Markdown and HTML processing
  gem 'html-pipeline', '~> 2.12'
@@ -185,7 +185,7 @@ gitlab Gemfile
  gem 'escape_utils', '~> 1.1'
  
  # Calendar rendering
-@@ -165,7 +165,7 @@
+@@ -168,7 +168,7 @@
  gem 'diff_match_patch', '~> 0.1.0'
  
  # Application server
@@ -194,15 +194,15 @@ gitlab Gemfile
  # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
  gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
  
-@@ -186,13 +186,13 @@
+@@ -189,13 +189,13 @@
  gem 'acts-as-taggable-on', '~> 6.0'
  
  # Background jobs
 -gem 'sidekiq', '~> 5.2.7'
 +gem 'sidekiq', '~> 5.2', '>= 5.2.7'
  gem 'sidekiq-cron', '~> 1.0'
--gem 'redis-namespace', '~> 1.6.0'
-+gem 'redis-namespace', '~> 1.6'
+-gem 'redis-namespace', '~> 1.7.0'
++gem 'redis-namespace', '~> 1.7'
  gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch'
  
  # Cron Parser
@@ -211,7 +211,7 @@ gitlab Gemfile
  
  # HTTP requests
  gem 'httparty', '~> 0.16.4'
-@@ -204,14 +204,14 @@
+@@ -207,14 +207,14 @@
  gem 'ruby-progressbar'
  
  # GitLab settings
@@ -228,8 +228,8 @@ gitlab Gemfile
 +gem 'version_sorter', '~> 2.2', '>= 2.2.4'
  
  # Export Ruby Regex to Javascript
- gem 'js_regex', '~> 3.1'
-@@ -224,23 +224,23 @@
+ gem 'js_regex', '~> 3.4'
+@@ -227,23 +227,23 @@
  gem 'connection_pool', '~> 2.0'
  
  # Redis session store
@@ -257,7 +257,7 @@ gitlab Gemfile
  
  # Hangouts Chat integration
  gem 'hangouts-chat', '~> 0.0.5'
-@@ -254,11 +254,11 @@
+@@ -257,11 +257,11 @@
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
@@ -271,7 +271,7 @@ gitlab Gemfile
  
  # Sanitizes SVG input
  gem 'loofah', '~> 2.2'
-@@ -267,7 +267,7 @@
+@@ -270,7 +270,7 @@
  gem 'licensee', '~> 8.9'
  
  # Ace editor
@@ -280,7 +280,7 @@ gitlab Gemfile
  
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.5'
-@@ -285,8 +285,8 @@
+@@ -288,8 +288,8 @@
  gem 'webpack-rails', '~> 0.9.10'
  gem 'rack-proxy', '~> 0.6.0'
  
@@ -291,7 +291,7 @@ gitlab Gemfile
  
  gem 'addressable', '~> 2.7'
  gem 'font-awesome-rails', '~> 4.7'
-@@ -298,24 +298,24 @@
+@@ -301,24 +301,24 @@
  gem "gitlab-license", "~> 1.0"
  
  # Protect against bruteforcing
@@ -322,7 +322,7 @@ gitlab Gemfile
  
  # Perf bar
  gem 'peek', '~> 1.1'
-@@ -348,29 +348,29 @@
+@@ -351,29 +351,29 @@
  
  group :development, :test do
    gem 'bullet', '~> 6.0.2'
@@ -363,7 +363,7 @@ gitlab Gemfile
  
    gem 'scss_lint', '~> 0.56.0', require: false
    gem 'haml_lint', '~> 0.34.0', require: false
-@@ -378,11 +378,11 @@
+@@ -381,11 +381,11 @@
    gem 'simplecov-cobertura', '~> 1.3.1', require: false
    gem 'bundler-audit', '~> 0.6.1', require: false
  
@@ -377,7 +377,7 @@ gitlab Gemfile
  
    gem 'timecop', '~> 0.9.1'
  
-@@ -399,18 +399,18 @@
+@@ -402,18 +402,18 @@
  end
  
  group :test do
@@ -387,9 +387,9 @@ gitlab Gemfile
    gem 'rspec_profiling', '~> 0.0.5'
    gem 'rspec-parameterized', require: false
  
--  gem 'capybara', '~> 3.22.0'
+-  gem 'capybara', '~> 3.33.0'
 -  gem 'capybara-screenshot', '~> 1.0.22'
-+  gem 'capybara', '~> 3.22'
++  gem 'capybara', '~> 3.33'
 +  gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
    gem 'selenium-webdriver', '~> 3.142'
  
@@ -401,8 +401,8 @@ gitlab Gemfile
 +  gem 'webmock', '~> 3.5', '>= 3.5.1'
    gem 'rails-controller-testing'
    gem 'concurrent-ruby', '~> 1.1'
-   gem 'test-prof', '~> 0.10.0'
-@@ -429,7 +429,7 @@
+   gem 'test-prof', '~> 0.12.0'
+@@ -432,7 +432,7 @@
  gem 'email_reply_trimmer', '~> 0.1'
  gem 'html2text'
  
@@ -411,12 +411,8 @@ gitlab Gemfile
  gem 'stackprof', '~> 0.2.15', require: false
  gem 'rbtrace', '~> 0.4', require: false
  gem 'memory_profiler', '~> 0.9', require: false
-@@ -440,11 +440,11 @@
- gem 'oauth2', '~> 1.4'
- 
- # Health check
--gem 'health_check', '~> 2.6.0'
-+gem 'health_check', '~> 2.6'
+@@ -446,8 +446,8 @@
+ gem 'health_check', '~> 3.0'
  
  # System information
 -gem 'vmstat', '~> 2.3.0'
@@ -426,25 +422,23 @@ gitlab Gemfile
  
  # NTP client
  gem 'net-ntp'
-@@ -460,13 +460,13 @@
+@@ -463,13 +463,13 @@
  end
  
  # Gitaly GRPC protocol definitions
--gem 'gitaly', '~> 13.2.0.pre.rc2'
-+gem 'gitaly', '~> 13.2'
+-gem 'gitaly', '~> 13.3.0-rc1'
++gem 'gitaly', '~> 13.3'
  
--gem 'grpc', '~> 1.24.0'
-+gem 'grpc', '~> 1.24'
+ gem 'grpc', '~> 1.30.2'
  
--gem 'google-protobuf', '~> 3.8.0'
-+gem 'google-protobuf', '~> 3.8'
+ gem 'google-protobuf', '~> 3.12'
  
 -gem 'toml-rb', '~> 1.0.0'
 +gem 'toml-rb', '~> 1.0'
  
  # Feature toggles
  gem 'flipper', '~> 0.17.1'
-@@ -484,12 +484,12 @@
+@@ -487,12 +487,12 @@
  # Countries list
  gem 'countries', '~> 3.0'
  
@@ -459,15 +453,18 @@ gitlab Gemfile
  
  # Locked as long as quoted-printable encoding issues are not resolved
  # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
-@@ -503,7 +503,7 @@
+@@ -506,9 +506,9 @@
  gem 'valid_email', '~> 0.1'
  
  # JSON
 -gem 'json', '~> 2.3.0'
 -gem 'json-schema', '~> 2.8.0'
--gem 'oj', '~> 3.10.6'
--gem 'multi_json', '~> 1.14.1'
 +gem 'json', '~> 2.3'
 +gem 'json-schema', '~> 2.8'
+ gem 'json_schemer', '~> 0.2.12'
+-gem 'oj', '~> 3.10.6'
+-gem 'multi_json', '~> 1.14.1'
+-gem 'yajl-ruby', '~> 1.4.1', require: 'yajl'
 +gem 'oj', '~> 3.10', '>= 3.10.6'
 +gem 'multi_json', '~> 1.14', '>= 1.14.1'
++gem 'yajl-ruby', '~> 1.4', '>= 1.4.1', require: 'yajl'
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index 0c976bebec..a14b6474c0 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/debian/patches/0100-remove-development-test.patch
@@ -10,7 +10,7 @@ Bundler will fail when it can't find these locally
  
  # Disable strong_params so that Mash does not respond to :permitted?
  gem 'hashie-forbidden_attributes'
-@@ -313,7 +312,6 @@
+@@ -316,7 +315,6 @@
  gem 'rails-i18n', '~> 6.0'
  gem 'gettext_i18n_rails', '~> 1.8'
  gem 'gettext_i18n_rails_js', '~> 1.3'
@@ -18,7 +18,7 @@ Bundler will fail when it can't find these locally
  
  gem 'batch-loader', '~> 1.4'
  
-@@ -332,20 +330,6 @@
+@@ -335,20 +333,6 @@
    gem 'raindrops', '~> 0.18'
  end
  
@@ -39,7 +39,7 @@ Bundler will fail when it can't find these locally
  group :development, :test do
    gem 'bullet', '~> 6.0.2'
    gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri
-@@ -366,18 +350,6 @@
+@@ -369,18 +353,6 @@
    gem 'spring', '~> 2.0'
    gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
  
@@ -58,7 +58,7 @@ Bundler will fail when it can't find these locally
    gem 'benchmark-ips', '~> 2.3', require: false
  
    gem 'knapsack', '~> 1.17'
-@@ -393,11 +365,6 @@
+@@ -396,11 +368,6 @@
    gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
  end
  
diff --git a/debian/patches/0110-make-test-dependencies-conditional.patch b/debian/patches/0110-make-test-dependencies-conditional.patch
index b99981824a..815831e42a 100644
--- a/debian/patches/0110-make-test-dependencies-conditional.patch
+++ b/debian/patches/0110-make-test-dependencies-conditional.patch
@@ -2,7 +2,7 @@ Make test dependencies conditional so we can enable them when running autopkgtes
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -330,7 +330,7 @@
+@@ -333,7 +333,7 @@
    gem 'raindrops', '~> 0.18'
  end
  
@@ -11,7 +11,7 @@ Make test dependencies conditional so we can enable them when running autopkgtes
    gem 'bullet', '~> 6.0.2'
    gem 'pry-byebug', '~> 3.5','>= 3.5.1', platform: :mri
    gem 'pry-rails', '~> 0.3.9'
-@@ -363,9 +363,7 @@
+@@ -366,9 +366,7 @@
    gem 'parallel', '~> 1.19', require: false
  
    gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
diff --git a/debian/patches/0340-relax-httparty.patch b/debian/patches/0340-relax-httparty.patch
index add139ab2a..1c4127b2d6 100644
--- a/debian/patches/0340-relax-httparty.patch
+++ b/debian/patches/0340-relax-httparty.patch
@@ -2,7 +2,7 @@ Allow newer versions of httparty to satisfy dependency
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -194,7 +194,7 @@
+@@ -197,7 +197,7 @@
  gem 'fugit', '~> 1.2', '>= 1.2.1'
  
  # HTTP requests
diff --git a/debian/patches/0350-relax-method-source.patch b/debian/patches/0350-relax-method-source.patch
index 8d98d262f5..7c195896d0 100644
--- a/debian/patches/0350-relax-method-source.patch
+++ b/debian/patches/0350-relax-method-source.patch
@@ -2,7 +2,7 @@ Allow newer version to satisfy requirement
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -323,7 +323,7 @@
+@@ -326,7 +326,7 @@
  
  # Metrics
  group :metrics do
@@ -10,4 +10,4 @@ Allow newer version to satisfy requirement
 +  gem 'method_source', '~> 1.0', require: false
  
    # Prometheus
-   gem 'prometheus-client-mmap', '~> 0.10.0'
+   gem 'prometheus-client-mmap', '~> 0.11.0'
diff --git a/debian/patches/0350-relax-rdoc.patch b/debian/patches/0350-relax-rdoc.patch
index f5e12003cf..c8b30553b1 100644
--- a/debian/patches/0350-relax-rdoc.patch
+++ b/debian/patches/0350-relax-rdoc.patch
@@ -2,7 +2,7 @@ Allow rdoc from ruby 2.5 to match requirement
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -143,7 +143,7 @@
+@@ -146,7 +146,7 @@
  gem 'commonmarker', '~> 0.20'
  gem 'kramdown', '~> 2.3'
  gem 'RedCloth', '~> 4.3', '>= 4.3.2'
diff --git a/debian/patches/0430-remove-gitlab-markup.patch b/debian/patches/0430-remove-gitlab-markup.patch
index 62fc3963e4..0e253ad9f8 100644
--- a/debian/patches/0430-remove-gitlab-markup.patch
+++ b/debian/patches/0430-remove-gitlab-markup.patch
@@ -4,7 +4,7 @@ maintaining two almost same packages.
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -138,7 +138,6 @@
+@@ -141,7 +141,6 @@
  # Markdown and HTML processing
  gem 'html-pipeline', '~> 2.12'
  gem 'deckar01-task_list', '~> 2.3', '>= 2.3.1'
diff --git a/debian/patches/0440-remove-unicorn.patch b/debian/patches/0440-remove-unicorn.patch
index 7d8a24dc03..632657885d 100644
--- a/debian/patches/0440-remove-unicorn.patch
+++ b/debian/patches/0440-remove-unicorn.patch
@@ -3,7 +3,7 @@ gitlab-puma changes is included in puma package.
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -167,14 +167,9 @@
+@@ -170,14 +170,9 @@
  # https://github.com/sharpstone/rack-timeout/blob/master/README.md#rails-apps-manually
  gem 'rack-timeout', '~> 0.5.1', require: 'rack/timeout/base'
  
diff --git a/debian/patches/0480-embed-elasticsearch-model.patch b/debian/patches/0480-embed-elasticsearch-model.patch
index e6a170e75e..49ccfacd42 100644
--- a/debian/patches/0480-embed-elasticsearch-model.patch
+++ b/debian/patches/0480-embed-elasticsearch-model.patch
@@ -2,7 +2,7 @@ Embed this gem until gitlab moved to 7.x version
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -129,7 +129,7 @@
+@@ -130,7 +130,7 @@
  gem 'seed-fu', '~> 2.3', '>= 2.3.7'
  
  # Search
@@ -10,4 +10,4 @@ Embed this gem until gitlab moved to 7.x version
 +gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'
  gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation'
  gem 'elasticsearch-api',   '~> 6.8'
- gem 'aws-sdk'
+ gem 'aws-sdk-core', '~> 3'
diff --git a/debian/patches/0480-embed-elasticsearch-rails.patch b/debian/patches/0480-embed-elasticsearch-rails.patch
index 53d041fbab..bd245924c6 100644
--- a/debian/patches/0480-embed-elasticsearch-rails.patch
+++ b/debian/patches/0480-embed-elasticsearch-rails.patch
@@ -2,12 +2,12 @@ Embed this gem until gitlab moved to 7.x version
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -130,7 +130,7 @@
+@@ -131,7 +131,7 @@
  
  # Search
  gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'
 -gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation'
 +gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
  gem 'elasticsearch-api',   '~> 6.8'
- gem 'aws-sdk'
- gem 'faraday_middleware-aws-signers-v4'
+ gem 'aws-sdk-core', '~> 3'
+ gem 'aws-sdk-cloudformation', '~> 1'
diff --git a/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch b/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch
deleted file mode 100644
index 46e11e007b..0000000000
--- a/debian/patches/0480-embed-faraday-middleware-aws-signers-v4.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This gem is unmaintained so not a good idea to package it. Once gitlab moves to
-aws-sdk 3.0 we can remove this.
-
-Bug: https://gitlab.com/gitlab-org/gitlab/-/issues/37931
-
---- a/Gemfile
-+++ b/Gemfile
-@@ -133,7 +133,7 @@
- gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
- gem 'elasticsearch-api',   '~> 6.8'
- gem 'aws-sdk'
--gem 'faraday_middleware-aws-signers-v4'
-+gem 'faraday_middleware-aws-signers-v4', path: 'vendor/gems/faraday-middleware-aws-signers-v4'
- 
- # Markdown and HTML processing
- gem 'html-pipeline', '~> 2.12'
diff --git a/debian/patches/0482-remove-ee-only-gems.patch b/debian/patches/0482-remove-ee-only-gems.patch
index daa57d77e2..b389b4dc52 100644
--- a/debian/patches/0482-remove-ee-only-gems.patch
+++ b/debian/patches/0482-remove-ee-only-gems.patch
@@ -12,7 +12,7 @@ This gem is used only in gitlab Enterprise Edition
  # Spam and anti-bot protection
  gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
  gem 'akismet', '~> 3.0'
-@@ -288,8 +285,6 @@
+@@ -291,8 +288,6 @@
  gem 'request_store', '~> 1.5'
  gem 'base32', '~> 0.3.0'
  
diff --git a/debian/patches/0485-relax-gitlab-sidekiq-fetcher.patch b/debian/patches/0485-relax-gitlab-sidekiq-fetcher.patch
index 1884a9d1af..a191a44a6a 100644
--- a/debian/patches/0485-relax-gitlab-sidekiq-fetcher.patch
+++ b/debian/patches/0485-relax-gitlab-sidekiq-fetcher.patch
@@ -2,10 +2,10 @@ Allow newer version in the archive to satisfy the requirement
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -179,7 +179,7 @@
+@@ -182,7 +182,7 @@
  gem 'sidekiq', '~> 5.2', '>= 5.2.7'
  gem 'sidekiq-cron', '~> 1.0'
- gem 'redis-namespace', '~> 1.6'
+ gem 'redis-namespace', '~> 1.7'
 -gem 'gitlab-sidekiq-fetcher', '0.5.2', require: 'sidekiq-reliable-fetch'
 +gem 'gitlab-sidekiq-fetcher', '~> 0.6.1', require: 'sidekiq-reliable-fetch'
  
diff --git a/debian/patches/0486-relax-sidekiq.patch b/debian/patches/0486-relax-sidekiq.patch
index 3f20873a94..e653ab54e9 100644
--- a/debian/patches/0486-relax-sidekiq.patch
+++ b/debian/patches/0486-relax-sidekiq.patch
@@ -2,12 +2,12 @@ ruby-sidekiq 6 is in unstable
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -176,7 +176,7 @@
+@@ -179,7 +179,7 @@
  gem 'acts-as-taggable-on', '~> 6.0'
  
  # Background jobs
 -gem 'sidekiq', '~> 5.2', '>= 5.2.7'
 +gem 'sidekiq', '< 7.0', '>= 5.2.7'
  gem 'sidekiq-cron', '~> 1.0'
- gem 'redis-namespace', '~> 1.6'
+ gem 'redis-namespace', '~> 1.7'
  gem 'gitlab-sidekiq-fetcher', '~> 0.6.1', require: 'sidekiq-reliable-fetch'
diff --git a/debian/patches/0487-relax-browser.patch b/debian/patches/0487-relax-browser.patch
deleted file mode 100644
index 2044fb3331..0000000000
--- a/debian/patches/0487-relax-browser.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From bf53d8ef7eb5dfdfc825267c5bb2ec8c0e17948f Mon Sep 17 00:00:00 2001
-From: Pirate Praveen <praveen@debian.org>
-Date: Mon, 13 Jul 2020 10:41:30 +0000
-Subject: [PATCH] Update browser rubygem 2.5 to 4.2
-
----
- Gemfile      | 2 +-
- Gemfile.lock | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/Gemfile
-+++ b/Gemfile
-@@ -66,7 +66,7 @@
- gem 'acme-client', '~> 2.0', '>= 2.0.6'
- 
- # Browser detection
--gem 'browser', '~> 2.5'
-+gem 'browser', '~> 4.2'
- 
- # GPG
- gem 'gpgme', '~> 2.0', '>= 2.0.19'
---- a/Gemfile.lock
-+++ b/Gemfile.lock
-@@ -125,7 +125,7 @@
-       actionpack (>= 5.0)
-       activemodel (>= 5.0)
-     brakeman (4.2.1)
--    browser (2.5.3)
-+    browser (4.2.0)
-     builder (3.2.4)
-     bullet (6.0.2)
-       activesupport (>= 3.0.0)
-@@ -1195,7 +1195,7 @@
-   bootsnap (~> 1.4.6)
-   bootstrap_form (~> 4.2.0)
-   brakeman (~> 4.2)
--  browser (~> 2.5)
-+  browser (~> 4.2)
-   bullet (~> 6.0.2)
-   bundler-audit (~> 0.6.1)
-   capybara (~> 3.22.0)
diff --git a/debian/patches/0510-remove-dev-dependencies.patch b/debian/patches/0510-remove-dev-dependencies.patch
index b312152520..05fc80eaa3 100644
--- a/debian/patches/0510-remove-dev-dependencies.patch
+++ b/debian/patches/0510-remove-dev-dependencies.patch
@@ -2,20 +2,19 @@ These are not required in production
 
 --- a/package.json
 +++ b/package.json
-@@ -156,66 +156,7 @@
+@@ -159,64 +159,6 @@
      "xterm": "3.14.5"
    },
    "devDependencies": {
 -    "@babel/plugin-transform-modules-commonjs": "^7.10.1",
--    "@gitlab/eslint-plugin": "3.1.0",
+-    "@gitlab/eslint-plugin": "3.2.0",
 -    "@testing-library/dom": "^7.16.2",
--    "@vue/test-utils": "^1.0.0-beta.30",
+-    "@vue/test-utils": "1.0.0-beta.30",
 -    "acorn": "^6.3.0",
 -    "axios-mock-adapter": "^1.15.0",
 -    "babel-jest": "^24.1.0",
 -    "babel-plugin-dynamic-import-node": "^2.2.0",
 -    "babel-plugin-istanbul": "^5.1.0",
--    "babel-plugin-rewire": "^1.2.0",
 -    "chalk": "^2.4.1",
 -    "commander": "^2.18.0",
 -    "custom-jquery-matchers": "^2.1.0",
@@ -48,7 +47,7 @@ These are not required in production
 -    "karma-mocha-reporter": "^2.2.5",
 -    "karma-sourcemap-loader": "^0.3.7",
 -    "karma-webpack": "^4.0.2",
--    "markdownlint-cli": "0.18.0",
+-    "markdownlint-cli": "0.23.2",
 -    "md5": "^2.2.1",
 -    "node-sass": "^4.12.0",
 -    "nodemon": "^2.0.4",
@@ -60,13 +59,11 @@ These are not required in production
 -    "stylelint-config-recommended": "^2.2.0",
 -    "stylelint-scss": "^3.9.2",
 -    "timezone-mock": "^1.0.8",
--    "vue-jest": "^4.0.0-beta.2",
+-    "vue-jest": "4.0.0-beta.2",
 -    "webpack-dev-server": "^3.10.3",
 -    "xhr-mock": "^2.5.1",
 -    "yarn-check-webpack-plugin": "^1.2.0",
 -    "yarn-deduplicate": "^1.1.1"
--  },
-+     },
+   },
    "blockedDependencies": {
      "bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
-   },
diff --git a/debian/patches/0520-add-system-lib-path-for-webpack.patch b/debian/patches/0520-add-system-lib-path-for-webpack.patch
index dc7647f682..94bcb60cbb 100644
--- a/debian/patches/0520-add-system-lib-path-for-webpack.patch
+++ b/debian/patches/0520-add-system-lib-path-for-webpack.patch
@@ -2,7 +2,7 @@ Debian specific patch to allow webpack to resolve packaged node modules
 
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -149,9 +149,14 @@
+@@ -159,9 +159,14 @@
  
    resolve: {
      extensions: ['.js', '.gql', '.graphql'],
diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch
index 2b0855e55c..1f34d3560d 100644
--- a/debian/patches/0740-use-packaged-modules.patch
+++ b/debian/patches/0740-use-packaged-modules.patch
@@ -14,7 +14,7 @@ Use debian packaged node modules when available
  const CopyWebpackPlugin = require('copy-webpack-plugin');
  const vendorDllHash = require('./helpers/vendor_dll_hash');
  
-@@ -148,13 +147,13 @@
+@@ -158,13 +157,13 @@
    },
  
    resolve: {
@@ -31,7 +31,7 @@ Use debian packaged node modules when available
    },
  
    module: {
-@@ -167,9 +166,13 @@
+@@ -177,9 +176,13 @@
        },
        {
          test: /\.js$/,
@@ -46,7 +46,7 @@ Use debian packaged node modules when available
          loader: 'babel-loader',
          options: {
            cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
-@@ -501,19 +504,6 @@
+@@ -513,19 +516,6 @@
      // enable HMR only in webpack-dev-server
      DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
  
@@ -66,7 +66,7 @@ Use debian packaged node modules when available
      new webpack.DefinePlugin({
        // This one is used to define window.gon.ee and other things properly in tests:
        'process.env.IS_EE': JSON.stringify(IS_EE),
-@@ -547,6 +537,7 @@
+@@ -559,6 +549,7 @@
  
    node: {
      fs: 'empty', // sqljs requires fs
@@ -87,12 +87,12 @@ Use debian packaged node modules when available
 -    "@babel/plugin-syntax-import-meta": "^7.10.1",
 -    "@babel/preset-env": "^7.10.1",
      "@gitlab/at.js": "1.5.5",
-     "@gitlab/svgs": "1.152.0",
-     "@gitlab/ui": "17.33.0",
-@@ -55,55 +49,29 @@
-     "apollo-link": "^1.2.11",
-     "apollo-link-batch-http": "^1.2.11",
-     "apollo-upload-client": "^10.0.0",
+     "@gitlab/svgs": "1.158.0",
+     "@gitlab/ui": "20.3.1",
+@@ -55,29 +49,13 @@
+     "apollo-link": "^1.2.14",
+     "apollo-link-batch-http": "^1.2.14",
+     "apollo-upload-client": "^13.0.0",
 -    "autosize": "^4.0.2",
      "aws-sdk": "^2.637.0",
 -    "axios": "^0.19.0",
@@ -107,6 +107,7 @@ Use debian packaged node modules when available
 -    "compression-webpack-plugin": "^3.0.1",
      "copy-webpack-plugin": "^5.0.5",
 -    "core-js": "^3.6.4",
+     "cron-validator": "^1.1.1",
      "cropper": "^2.3.0",
 -    "css-loader": "^2.1.1",
 -    "d3": "^5.16.0",
@@ -117,17 +118,18 @@ Use debian packaged node modules when available
 -    "deckar01-task_list": "^2.3.1",
      "diff": "^3.4.0",
      "document-register-element": "1.14.3",
-     "dropzone": "^4.2.0",
+     "dompurify": "^2.0.11",
+@@ -85,27 +63,17 @@
      "editorconfig": "^0.15.3",
      "emoji-regex": "^7.0.3",
      "emoji-unicode-version": "^0.2.1",
 -    "exports-loader": "^0.7.0",
      "file-loader": "^5.1.0",
+     "font-awesome": "4.7.0",
      "fuzzaldrin-plus": "^0.6.0",
 -    "glob": "^7.1.6",
-     "graphql": "^14.0.2",
+     "graphql": "^14.7.0",
      "graphql-tag": "^2.10.1",
-     "immer": "^5.2.1",
 -    "imports-loader": "^0.8.0",
      "ipaddr.js": "^1.9.1",
 -    "jed": "^1.1.1",
@@ -145,10 +147,10 @@ Use debian packaged node modules when available
      "marked": "^0.3.12",
      "mermaid": "^8.5.2",
      "mersenne-twister": "1.1.0",
-@@ -111,13 +79,8 @@
+@@ -115,13 +83,8 @@
      "monaco-editor": "^0.20.0",
      "monaco-editor-webpack-plugin": "^1.9.0",
-     "monaco-yaml": "^2.4.0",
+     "monaco-yaml": "^2.4.1",
 -    "mousetrap": "^1.4.6",
      "pdfjs-dist": "^2.0.943",
      "pikaday": "^1.8.0",
@@ -158,8 +160,8 @@ Use debian packaged node modules when available
 -    "prosemirror-model": "^1.6.4",
      "raphael": "^2.2.7",
      "raw-loader": "^4.0.0",
-     "sanitize-html": "^1.22.0",
-@@ -130,30 +93,19 @@
+     "select2": "3.5.2-browserify",
+@@ -133,30 +96,19 @@
      "style-loader": "^1.1.3",
      "swagger-ui-dist": "^3.26.2",
      "three": "^0.84.0",
@@ -190,10 +192,10 @@ Use debian packaged node modules when available
 +    "webpack-stats-plugin": "^0.3.1"
    },
    "devDependencies": {
-      },
+   },
 --- a/babel.config.js
 +++ b/babel.config.js
-@@ -19,9 +19,12 @@
+@@ -34,9 +34,12 @@
  // include stage 3 proposals
  const plugins = [
    '@babel/plugin-syntax-import-meta',
@@ -203,6 +205,6 @@ Use debian packaged node modules when available
    '@babel/plugin-proposal-private-methods',
 +  '@babel/plugin-proposal-optional-chaining',
 +  '@babel/plugin-proposal-nullish-coalescing-operator',
+   // See: https://gitlab.com/gitlab-org/gitlab/-/issues/229146
+   '@babel/plugin-transform-arrow-functions',
    'lodash',
- ];
- 
diff --git a/debian/patches/0790-protobuf-compat.patch b/debian/patches/0790-protobuf-compat.patch
deleted file mode 100644
index 577cd22830..0000000000
--- a/debian/patches/0790-protobuf-compat.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 3c23634c00ce6c03ea67d74bbfde593a694cee07 Mon Sep 17 00:00:00 2001
-From: Pirate Praveen <praveen@debian.org>
-Date: Sun, 22 Mar 2020 13:10:23 +0000
-Subject: [PATCH 2/2] Fix protobuf compatibility (Thanks to Stan Hu)
-
----
- lib/api/helpers/internal_helpers.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/lib/api/helpers/internal_helpers.rb
-+++ b/lib/api/helpers/internal_helpers.rb
-@@ -117,7 +117,7 @@
-         return unless %w[git-receive-pack git-upload-pack git-upload-archive].include?(action)
- 
-         {
--          repository: repository.gitaly_repository,
-+          repository: repository.gitaly_repository.to_h,
-           address: Gitlab::GitalyClient.address(repository.shard),
-           token: Gitlab::GitalyClient.token(repository.shard),
-           features: Feature::Gitaly.server_feature_flags
diff --git a/debian/patches/0791-aws-sdk-v3.patch b/debian/patches/0791-aws-sdk-v3.patch
deleted file mode 100644
index c57f2bae0f..0000000000
--- a/debian/patches/0791-aws-sdk-v3.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -129,8 +129,10 @@
- gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'
- gem 'elasticsearch-rails', '~> 6.1', require: 'elasticsearch/rails/instrumentation', path: 'vendor/gems/elasticsearch-rails'
- gem 'elasticsearch-api',   '~> 6.8'
--gem 'aws-sdk'
--gem 'faraday_middleware-aws-signers-v4', path: 'vendor/gems/faraday-middleware-aws-signers-v4'
-+gem 'aws-sdk-core', '~> 3'
-+gem 'aws-sdk-cloudformation', '~> 1'
-+gem 'aws-sdk-s3', '~> 1'
-+gem 'faraday_middleware-aws-sigv4', '~> 0.3.0'
- 
- # Markdown and HTML processing
- gem 'html-pipeline', '~> 2.12'
---- a/Gemfile.lock
-+++ b/Gemfile.lock
-@@ -93,16 +93,25 @@
-       encryptor (~> 3.0.0)
-     attr_required (1.0.1)
-     awesome_print (1.8.0)
--    aws-eventstream (1.0.3)
--    aws-sdk (2.11.374)
--      aws-sdk-resources (= 2.11.374)
--    aws-sdk-core (2.11.374)
--      aws-sigv4 (~> 1.0)
-+    aws-eventstream (1.1.0)
-+    aws-partitions (1.345.0)
-+    aws-sdk-cloudformation (1.41.0)
-+      aws-sdk-core (~> 3, >= 3.99.0)
-+      aws-sigv4 (~> 1.1)
-+    aws-sdk-core (3.104.3)
-+      aws-eventstream (~> 1, >= 1.0.2)
-+      aws-partitions (~> 1, >= 1.239.0)
-+      aws-sigv4 (~> 1.1)
-       jmespath (~> 1.0)
--    aws-sdk-resources (2.11.374)
--      aws-sdk-core (= 2.11.374)
--    aws-sigv4 (1.1.0)
--      aws-eventstream (~> 1.0, >= 1.0.2)
-+    aws-sdk-kms (1.36.0)
-+      aws-sdk-core (~> 3, >= 3.99.0)
-+      aws-sigv4 (~> 1.1)
-+    aws-sdk-s3 (1.75.0)
-+      aws-sdk-core (~> 3, >= 3.104.1)
-+      aws-sdk-kms (~> 1)
-+      aws-sigv4 (~> 1.1)
-+    aws-sigv4 (1.2.1)
-+      aws-eventstream (~> 1, >= 1.0.2)
-     babosa (1.0.2)
-     base32 (0.3.2)
-     batch-loader (1.4.0)
-@@ -306,9 +315,9 @@
-       faraday (~> 0.8)
-     faraday_middleware (0.14.0)
-       faraday (>= 0.7.4, < 1.0)
--    faraday_middleware-aws-signers-v4 (0.1.7)
--      aws-sdk-resources (~> 2)
--      faraday (~> 0.9)
-+    faraday_middleware-aws-sigv4 (0.3.0)
-+      aws-sigv4 (~> 1.0)
-+      faraday (>= 0.15)
-     faraday_middleware-multi_json (0.0.6)
-       faraday_middleware
-       multi_json
-@@ -1183,7 +1192,9 @@
-   atlassian-jwt (~> 0.2.0)
-   attr_encrypted (~> 3.1.0)
-   awesome_print
--  aws-sdk
-+  aws-sdk-cloudformation (~> 1)
-+  aws-sdk-core (~> 3)
-+  aws-sdk-s3 (~> 1)
-   babosa (~> 1.0.2)
-   base32 (~> 0.3.0)
-   batch-loader (~> 1.4.0)
-@@ -1230,7 +1241,7 @@
-   escape_utils (~> 1.1)
-   factory_bot_rails (~> 5.1.0)
-   faraday (~> 0.12)
--  faraday_middleware-aws-signers-v4
-+  faraday_middleware-aws-sigv4 (~> 0.3.0)
-   fast_blank
-   ffaker (~> 2.10)
-   flipper (~> 0.17.1)
diff --git a/debian/patches/series b/debian/patches/series
index 917e7bc434..281036056d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,12 +8,10 @@
 0440-remove-unicorn.patch
 0480-embed-elasticsearch-model.patch
 0480-embed-elasticsearch-rails.patch
-0480-embed-faraday-middleware-aws-signers-v4.patch
 0482-remove-ee-only-gems.patch
 0484-relax-grape-entity.patch
 0485-relax-gitlab-sidekiq-fetcher.patch
 0486-relax-sidekiq.patch
-0487-relax-browser.patch
 0500-set-webpack-root.patch
 0510-remove-dev-dependencies.patch
 0520-add-system-lib-path-for-webpack.patch
@@ -26,5 +24,3 @@
 0710-use-yarnpkg.patch
 0740-use-packaged-modules.patch
 0750-fix-relative-paths.patch
-0790-protobuf-compat.patch
-0791-aws-sdk-v3.patch