From 8badeed3e517933f7af2c4d928678140232ce802 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Wed, 9 Jun 2021 22:52:32 +0530
Subject: [PATCH] Refresh patches

---
 debian/patches/0050-relax-stable-libs.patch   | 76 ++++++++++---------
 .../0100-remove-development-test.patch        | 15 ++--
 ...0-make-test-dependencies-conditional.patch |  8 +-
 debian/patches/0340-relax-httparty.patch      |  2 +-
 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      |  2 +-
 .../0480-embed-elasticsearch-rails.patch      |  2 +-
 debian/patches/0482-remove-ee-only-gems.patch |  6 +-
 debian/patches/0484-relax-grape-entity.patch  | 13 ----
 .../0485-relax-gitlab-sidekiq-fetcher.patch   |  2 +-
 debian/patches/0486-relax-sidekiq.patch       |  2 +-
 debian/patches/0499-10-relax-capybara.patch   |  4 +-
 .../0499-20-remove-capybara-screenshot.patch  |  2 +-
 .../patches/0499-30-remove-guard-rspec.patch  |  2 +-
 debian/patches/0499-40-relax-rouge.patch      |  2 +-
 debian/patches/0499-70-relax-graphlient.patch |  2 +-
 debian/patches/0499-90-relax-webrick.patch    |  2 +-
 ...ax-omniauth-azure-activedirectory-v2.patch |  2 +-
 debian/patches/0499-92-relax-rexml.patch      |  2 +-
 .../0510-remove-dev-dependencies.patch        | 18 +++--
 ...0520-add-system-lib-path-for-webpack.patch | 19 -----
 .../patches/0700-add-salsa-link-to-help.patch |  2 +-
 .../patches/0740-use-packaged-modules.patch   | 54 ++++++-------
 debian/patches/series                         |  2 -
 26 files changed, 110 insertions(+), 137 deletions(-)
 delete mode 100644 debian/patches/0484-relax-grape-entity.patch
 delete mode 100644 debian/patches/0520-add-system-lib-path-for-webpack.patch

diff --git a/debian/patches/0050-relax-stable-libs.patch b/debian/patches/0050-relax-stable-libs.patch
index 2c5d7bb549..e142ca1567 100644
--- a/debian/patches/0050-relax-stable-libs.patch
+++ b/debian/patches/0050-relax-stable-libs.patch
@@ -3,7 +3,7 @@ gitlab Gemfile
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -2,55 +2,55 @@
+@@ -2,58 +2,58 @@
  
  source 'https://rubygems.org'
  
@@ -27,13 +27,17 @@ gitlab Gemfile
  gem 'pg', '~> 1.1'
  
  gem 'rugged', '~> 1.1'
--gem 'grape-path-helpers', '~> 1.6.1'
-+gem 'grape-path-helpers', '~> 1.6', '>= 1.6.1'
+-gem 'grape-path-helpers', '~> 1.6.3'
++gem 'grape-path-helpers', '~> 1.6', '>= 1.6.3'
  
  gem 'faraday', '~> 1.0'
 -gem 'marginalia', '~> 1.10.0'
 +gem 'marginalia', '~> 1.10'
  
+ # Authorization
+-gem 'declarative_policy', '~> 1.0.0'
++gem 'declarative_policy', '~> 1.0'
+ 
  # Authentication libraries
 -gem 'devise', '~> 4.7.2'
 +gem 'devise', '~> 4.7', '>= 4.7.2'
@@ -68,7 +72,7 @@ gitlab Gemfile
 -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 'gitlab-omniauth-openid-connect', '~> 0.4.0', require: 'omniauth_openid_connect'
 -gem 'omniauth-salesforce', '~> 1.0.5'
 +gem 'omniauth-salesforce', '~> 1.0', '>= 1.0.5'
  gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
@@ -79,7 +83,7 @@ gitlab Gemfile
  
  # Kerberos authentication. EE-only
  gem 'gssapi', group: :kerberos
-@@ -58,17 +58,17 @@
+@@ -61,17 +61,17 @@
  # Spam and anti-bot protection
  gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
  gem 'akismet', '~> 3.0'
@@ -102,7 +106,7 @@ gitlab Gemfile
  # GitLab Pages letsencrypt support
  gem 'acme-client', '~> 2.0', '>= 2.0.6'
  
-@@ -79,27 +79,27 @@
+@@ -82,27 +82,27 @@
  gem 'ohai', '~> 16.10'
  
  # GPG
@@ -119,7 +123,7 @@ gitlab Gemfile
  # API
 -gem 'grape', '~> 1.5.2'
 +gem 'grape', '~> 1.5', '>= 1.5.2'
- gem 'grape-entity', '~> 0.7.1'
+ gem 'grape-entity', '~> 0.9.0'
 -gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
 +gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors'
  
@@ -138,7 +142,7 @@ gitlab Gemfile
  gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
  
  gem 'hashie'
-@@ -110,11 +110,11 @@
+@@ -113,11 +113,11 @@
  gem 'kaminari', '~> 1.0'
  
  # HAML
@@ -152,7 +156,7 @@ gitlab Gemfile
  
  # for backups
  gem 'fog-aws', '~> 3.9'
-@@ -126,7 +126,7 @@
+@@ -129,7 +129,7 @@
  gem 'fog-openstack', '~> 1.0'
  gem 'fog-rackspace', '~> 0.1.1'
  gem 'fog-aliyun', '~> 0.3'
@@ -161,7 +165,7 @@ gitlab Gemfile
  
  # for Google storage
  gem 'google-api-client', '~> 0.33'
-@@ -135,37 +135,37 @@
+@@ -138,37 +138,37 @@
  gem 'unf', '~> 0.1.4'
  
  # Seed data
@@ -211,7 +215,7 @@ gitlab Gemfile
  gem 'escape_utils', '~> 1.1'
  
  # Calendar rendering
-@@ -176,7 +176,7 @@
+@@ -179,7 +179,7 @@
  gem 'diff_match_patch', '~> 0.1.0'
  
  # Application server
@@ -220,7 +224,7 @@ 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,7 +186,7 @@
+@@ -189,7 +189,7 @@
  end
  
  group :puma do
@@ -229,7 +233,7 @@ gitlab Gemfile
    gem 'puma_worker_killer', '~> 0.3.1', require: false
  end
  
-@@ -197,13 +197,13 @@
+@@ -200,13 +200,13 @@
  gem 'acts-as-taggable-on', '~> 7.0'
  
  # Background jobs
@@ -246,7 +250,7 @@ gitlab Gemfile
  
  # HTTP requests
  gem 'httparty', '~> 0.16.4'
-@@ -215,14 +215,14 @@
+@@ -218,14 +218,14 @@
  gem 'ruby-progressbar', '~> 1.10'
  
  # GitLab settings
@@ -264,7 +268,7 @@ gitlab Gemfile
  
  # Export Ruby Regex to Javascript
  gem 'js_regex', '~> 3.4'
-@@ -235,20 +235,20 @@
+@@ -238,20 +238,20 @@
  gem 'connection_pool', '~> 2.0'
  
  # Redis session store
@@ -288,7 +292,7 @@ gitlab Gemfile
  
  # Hangouts Chat integration
  gem 'hangouts-chat', '~> 0.0.5'
-@@ -260,17 +260,17 @@
+@@ -263,17 +263,17 @@
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
@@ -297,7 +301,7 @@ gitlab Gemfile
  
  # Sanitize user input
 -gem 'sanitize', '~> 5.2.1'
--gem 'babosa', '~> 1.0.2'
+-gem 'babosa', '~> 1.0.4'
 +gem 'sanitize', '~> 5.2', '>= 5.2.1'
 +gem 'babosa', '~> 1.0', '>= 1.0.2'
  
@@ -310,7 +314,7 @@ gitlab Gemfile
  
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.7'
-@@ -287,28 +287,28 @@
+@@ -290,28 +290,28 @@
  
  gem 'rack-proxy', '~> 0.6.0'
  
@@ -318,7 +322,7 @@ gitlab Gemfile
 -gem 'autoprefixer-rails', '10.2.0.0'
 -gem 'terser', '1.0.2'
 +gem 'sassc-rails', '~> 2.1'
-+gem 'autoprefixer-rails', '~> 10.2'
++gem 'autoprefixer-rails', '10.2'
 +gem 'terser', '~> 1.0', '>= 1.0.2'
  
  gem 'addressable', '~> 2.7'
@@ -328,7 +332,7 @@ gitlab Gemfile
  gem 'request_store', '~> 1.5'
  gem 'base32', '~> 0.3.0'
  
- gem "gitlab-license", "~> 1.4"
+ gem 'gitlab-license', '~> 1.5'
  
  # Protect against bruteforcing
 -gem 'rack-attack', '~> 6.3.0'
@@ -346,7 +350,7 @@ gitlab Gemfile
  
  # LabKit: Tracing and Correlation
  gem 'gitlab-labkit', '~> 0.16.2'
-@@ -319,11 +319,11 @@
+@@ -322,11 +322,11 @@
  # I18n
  gem 'ruby_parser', '~> 3.15', require: false
  gem 'rails-i18n', '~> 6.0'
@@ -360,7 +364,7 @@ gitlab Gemfile
  
  # Perf bar
  gem 'peek', '~> 1.1'
-@@ -354,38 +354,38 @@
+@@ -358,38 +358,38 @@
  end
  
  group :development, :test do
@@ -368,9 +372,9 @@ gitlab Gemfile
 -  gem 'bullet', '~> 6.1.3'
 +  gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
 +  gem 'bullet', '~> 6.1', '>= 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
  
@@ -411,21 +415,19 @@ gitlab Gemfile
  
    gem 'timecop', '~> 0.9.1'
  
-@@ -413,19 +413,19 @@
+@@ -417,18 +417,18 @@
  end
  
  group :test do
--  gem 'json-schema', '~> 2.8.0'
 -  gem 'fuubar', '~> 2.2.0'
-+  gem 'json-schema', '~> 2.8'
 +  gem 'fuubar', '~> 2.2'
    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 'capybara', '~> 3.34'
++  gem 'capybara', '~> 3.35', '~> 3.35.3'
 +  gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
    gem 'selenium-webdriver', '~> 3.142'
  
@@ -438,7 +440,7 @@ gitlab Gemfile
    gem 'rails-controller-testing'
    gem 'concurrent-ruby', '~> 1.1'
    gem 'test-prof', '~> 0.12.0'
-@@ -444,7 +444,7 @@
+@@ -447,7 +447,7 @@
  gem 'email_reply_trimmer', '~> 0.1'
  gem 'html2text'
  
@@ -447,7 +449,7 @@ gitlab Gemfile
  gem 'stackprof', '~> 0.2.15', require: false
  gem 'rbtrace', '~> 0.4', require: false
  gem 'memory_profiler', '~> 0.9', require: false
-@@ -458,8 +458,8 @@
+@@ -461,8 +461,8 @@
  gem 'health_check', '~> 3.0'
  
  # System information
@@ -458,12 +460,12 @@ gitlab Gemfile
  
  # NTP client
  gem 'net-ntp'
-@@ -475,13 +475,13 @@
- end
+@@ -481,13 +481,13 @@
+ gem 'spamcheck', '~> 0.1.0'
  
  # Gitaly GRPC protocol definitions
--gem 'gitaly', '~> 13.11.0.pre.rc1'
-+gem 'gitaly', '~> 13.11'
+-gem 'gitaly', '~> 13.12.0.pre.rc1'
++gem 'gitaly', '~> 13.12'
  
 -gem 'grpc', '~> 1.30.2'
 +gem 'grpc', '~> 1.30', '>= 1.30.2'
@@ -476,7 +478,7 @@ gitlab Gemfile
  
  # Feature toggles
  gem 'flipper', '~> 0.17.1'
-@@ -500,12 +500,12 @@
+@@ -506,12 +506,12 @@
  # Countries list
  gem 'countries', '~> 3.0'
  
@@ -491,7 +493,7 @@ gitlab Gemfile
  
  # Locked as long as quoted-printable encoding issues are not resolved
  # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
-@@ -520,11 +520,11 @@
+@@ -526,11 +526,11 @@
  gem 'valid_email', '~> 0.1'
  
  # JSON
diff --git a/debian/patches/0100-remove-development-test.patch b/debian/patches/0100-remove-development-test.patch
index 6b42ca2a50..2ae44f3189 100644
--- a/debian/patches/0100-remove-development-test.patch
+++ b/debian/patches/0100-remove-development-test.patch
@@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -99,7 +99,6 @@
+@@ -102,7 +102,6 @@
  # https://gitlab.com/gitlab-org/gitlab/issues/31747
  gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
  gem 'apollo_upload_server', '~> 2.0', '>= 2.0.2'
@@ -10,7 +10,7 @@ Bundler will fail when it can't find these locally
  gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
  
  gem 'hashie'
-@@ -321,7 +320,6 @@
+@@ -324,7 +323,6 @@
  gem 'rails-i18n', '~> 6.0'
  gem 'gettext_i18n_rails', '~> 1.8'
  gem 'gettext_i18n_rails_js', '~> 1.3'
@@ -18,12 +18,13 @@ Bundler will fail when it can't find these locally
  
  gem 'batch-loader', '~> 2.0', '>= 2.0.1'
  
-@@ -341,18 +339,6 @@
+@@ -344,19 +342,6 @@
    gem 'raindrops', '~> 0.18'
  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'
 -
@@ -37,7 +38,7 @@ Bundler will fail when it can't find these locally
  group :development, :test do
    gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
    gem 'bullet', '~> 6.1', '>= 6.1.3'
-@@ -375,11 +361,6 @@
+@@ -379,11 +364,6 @@
    gem 'spring', '~> 2.1'
    gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
  
@@ -49,12 +50,12 @@ Bundler will fail when it can't find these locally
    gem 'benchmark-ips', '~> 2.3', require: false
  
    gem 'knapsack', '~> 1.21', '>= 1.21.1'
-@@ -398,20 +379,6 @@
+@@ -402,20 +382,6 @@
    gem 'test_file_finder', '~> 0.1.3'
  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
@@ -68,5 +69,5 @@ Bundler will fail when it can't find these locally
 -end
 -
  group :test do
-   gem 'json-schema', '~> 2.8'
    gem 'fuubar', '~> 2.2'
+   gem 'rspec-retry', '~> 0.6.1'
diff --git a/debian/patches/0110-make-test-dependencies-conditional.patch b/debian/patches/0110-make-test-dependencies-conditional.patch
index a1549d5d3c..2b4a054ee6 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
-@@ -339,7 +339,7 @@
+@@ -342,7 +342,7 @@
    gem 'raindrops', '~> 0.18'
  end
  
@@ -10,14 +10,14 @@ Make test dependencies conditional so we can enable them when running autopkgtes
 +if ENV["INCLUDE_TEST_DEPENDS"] == "true"
    gem 'deprecation_toolkit', '~> 1.5', '>= 1.5.1', require: false
    gem 'bullet', '~> 6.1', '>= 6.1.3'
-   gem 'gitlab-pry-byebug', platform: :mri, require: ['pry-byebug', 'pry-byebug/pry_remote_ext']
-@@ -377,9 +377,7 @@
+   gem 'pry-byebug'
+@@ -380,9 +380,7 @@
    gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
  
    gem 'test_file_finder', '~> 0.1.3'
 -end
  
 -group :test do
-   gem 'json-schema', '~> 2.8'
    gem 'fuubar', '~> 2.2'
    gem 'rspec-retry', '~> 0.6.1'
+   gem 'rspec_profiling', '~> 0.0.6'
diff --git a/debian/patches/0340-relax-httparty.patch b/debian/patches/0340-relax-httparty.patch
index 146931562f..2ad04b08da 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
-@@ -205,7 +205,7 @@
+@@ -208,7 +208,7 @@
  gem 'fugit', '~> 1.2', '>= 1.2.1'
  
  # HTTP requests
diff --git a/debian/patches/0350-relax-rdoc.patch b/debian/patches/0350-relax-rdoc.patch
index 7d8bc2d410..bc407fe7e0 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
-@@ -153,7 +153,7 @@
+@@ -156,7 +156,7 @@
  gem 'commonmarker', '~> 0.21'
  gem 'kramdown', '~> 2.3','>= 2.3.1'
  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 02ff838a3e..98a30b5e04 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
-@@ -148,7 +148,6 @@
+@@ -151,7 +151,6 @@
  # Markdown and HTML processing
  gem 'html-pipeline', '~> 2.13', '>= 2.13.2'
  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 22fc85894e..ea38018cd2 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
-@@ -178,11 +178,6 @@
+@@ -181,11 +181,6 @@
  # 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 2b578e5a8d..87bd9833f0 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
-@@ -137,7 +137,7 @@
+@@ -140,7 +140,7 @@
  gem 'seed-fu', '~> 2.3', '>= 2.3.7'
  
  # Search
diff --git a/debian/patches/0480-embed-elasticsearch-rails.patch b/debian/patches/0480-embed-elasticsearch-rails.patch
index 7103e9ed30..f5a444dc8e 100644
--- a/debian/patches/0480-embed-elasticsearch-rails.patch
+++ b/debian/patches/0480-embed-elasticsearch-rails.patch
@@ -2,7 +2,7 @@ Embed this gem until gitlab moved to 7.x version
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -138,7 +138,7 @@
+@@ -141,7 +141,7 @@
  
  # Search
  gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'
diff --git a/debian/patches/0482-remove-ee-only-gems.patch b/debian/patches/0482-remove-ee-only-gems.patch
index 2b726f20b1..bc15fa332a 100644
--- a/debian/patches/0482-remove-ee-only-gems.patch
+++ b/debian/patches/0482-remove-ee-only-gems.patch
@@ -2,7 +2,7 @@ This gem is used only in gitlab Enterprise Edition
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -52,9 +52,6 @@
+@@ -55,9 +55,6 @@
  gem 'rack-oauth2', '~> 1.16'
  gem 'jwt', '~> 2.1'
  
@@ -12,11 +12,11 @@ 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'
-@@ -290,8 +287,6 @@
+@@ -293,8 +290,6 @@
  gem 'request_store', '~> 1.5'
  gem 'base32', '~> 0.3.0'
  
--gem "gitlab-license", "~> 1.4"
+-gem 'gitlab-license', '~> 1.5'
 -
  # Protect against bruteforcing
  gem 'rack-attack', '~> 6.3'
diff --git a/debian/patches/0484-relax-grape-entity.patch b/debian/patches/0484-relax-grape-entity.patch
deleted file mode 100644
index 4ff50e02b3..0000000000
--- a/debian/patches/0484-relax-grape-entity.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Debian already has 0.8
-
---- a/Gemfile
-+++ b/Gemfile
-@@ -86,7 +86,7 @@
- 
- # API
- gem 'grape', '~> 1.5', '>= 1.5.2'
--gem 'grape-entity', '~> 0.7.1'
-+gem 'grape-entity', '~> 0.8'
- gem 'rack-cors', '~> 1.0', '>= 1.0.6', require: 'rack/cors'
- 
- # GraphQL API
diff --git a/debian/patches/0485-relax-gitlab-sidekiq-fetcher.patch b/debian/patches/0485-relax-gitlab-sidekiq-fetcher.patch
index 210664aa65..ff3bef810c 100644
--- a/debian/patches/0485-relax-gitlab-sidekiq-fetcher.patch
+++ b/debian/patches/0485-relax-gitlab-sidekiq-fetcher.patch
@@ -2,7 +2,7 @@ Allow newer version in the archive to satisfy the requirement
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -190,7 +190,7 @@
+@@ -193,7 +193,7 @@
  gem 'sidekiq', '~> 5.2', '>= 5.2.7'
  gem 'sidekiq-cron', '~> 1.0'
  gem 'redis-namespace', '~> 1.7'
diff --git a/debian/patches/0486-relax-sidekiq.patch b/debian/patches/0486-relax-sidekiq.patch
index 93fd6d8d6a..754ac67669 100644
--- a/debian/patches/0486-relax-sidekiq.patch
+++ b/debian/patches/0486-relax-sidekiq.patch
@@ -2,7 +2,7 @@ ruby-sidekiq 6 is in unstable
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -187,7 +187,7 @@
+@@ -190,7 +190,7 @@
  gem 'acts-as-taggable-on', '~> 7.0'
  
  # Background jobs
diff --git a/debian/patches/0499-10-relax-capybara.patch b/debian/patches/0499-10-relax-capybara.patch
index 03285a76b6..490dca3224 100644
--- a/debian/patches/0499-10-relax-capybara.patch
+++ b/debian/patches/0499-10-relax-capybara.patch
@@ -1,10 +1,10 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -373,7 +373,7 @@
+@@ -375,7 +375,7 @@
    gem 'rspec_profiling', '~> 0.0.6'
    gem 'rspec-parameterized', require: false
  
--  gem 'capybara', '~> 3.34'
+-  gem 'capybara', '~> 3.35', '~> 3.35.3'
 +  gem 'capybara', '~> 3.12'
    gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
    gem 'selenium-webdriver', '~> 3.142'
diff --git a/debian/patches/0499-20-remove-capybara-screenshot.patch b/debian/patches/0499-20-remove-capybara-screenshot.patch
index 142ba1e24c..2b5723eaf9 100644
--- a/debian/patches/0499-20-remove-capybara-screenshot.patch
+++ b/debian/patches/0499-20-remove-capybara-screenshot.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -374,7 +374,6 @@
+@@ -376,7 +376,6 @@
    gem 'rspec-parameterized', require: false
  
    gem 'capybara', '~> 3.12'
diff --git a/debian/patches/0499-30-remove-guard-rspec.patch b/debian/patches/0499-30-remove-guard-rspec.patch
index b9dee5d444..c07b12820a 100644
--- a/debian/patches/0499-30-remove-guard-rspec.patch
+++ b/debian/patches/0499-30-remove-guard-rspec.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -383,7 +383,6 @@
+@@ -385,7 +385,6 @@
    gem 'concurrent-ruby', '~> 1.1'
    gem 'test-prof', '~> 0.12.0'
    gem 'rspec_junit_formatter'
diff --git a/debian/patches/0499-40-relax-rouge.patch b/debian/patches/0499-40-relax-rouge.patch
index fddeea4a21..b15cbcf50c 100644
--- a/debian/patches/0499-40-relax-rouge.patch
+++ b/debian/patches/0499-40-relax-rouge.patch
@@ -3,7 +3,7 @@ rouge update is blocked by
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -157,7 +157,7 @@
+@@ -160,7 +160,7 @@
  gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
  gem 'asciidoctor-plantuml', '~> 0.0.12'
  gem 'asciidoctor-kroki', '~> 0.4.0', require: false
diff --git a/debian/patches/0499-70-relax-graphlient.patch b/debian/patches/0499-70-relax-graphlient.patch
index 5877571622..4df4ceb478 100644
--- a/debian/patches/0499-70-relax-graphlient.patch
+++ b/debian/patches/0499-70-relax-graphlient.patch
@@ -2,7 +2,7 @@ newer version is in the archive
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -96,7 +96,7 @@
+@@ -99,7 +99,7 @@
  # https://gitlab.com/gitlab-org/gitlab/issues/31747
  gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
  gem 'apollo_upload_server', '~> 2.0', '>= 2.0.2'
diff --git a/debian/patches/0499-90-relax-webrick.patch b/debian/patches/0499-90-relax-webrick.patch
index eb25c5da8b..9cd87c3e8d 100644
--- a/debian/patches/0499-90-relax-webrick.patch
+++ b/debian/patches/0499-90-relax-webrick.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -321,7 +321,7 @@
+@@ -324,7 +324,7 @@
  # Metrics
  group :metrics do
    gem 'method_source', '~> 1.0', require: false
diff --git a/debian/patches/0499-91-relax-omniauth-azure-activedirectory-v2.patch b/debian/patches/0499-91-relax-omniauth-azure-activedirectory-v2.patch
index 6c14355106..09cbd55212 100644
--- a/debian/patches/0499-91-relax-omniauth-azure-activedirectory-v2.patch
+++ b/debian/patches/0499-91-relax-omniauth-azure-activedirectory-v2.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -32,7 +32,7 @@
+@@ -35,7 +35,7 @@
  gem 'ruby-saml', '~> 1.12', '>= 1.12.1'
  gem 'omniauth', '~> 1.8'
  gem 'omniauth-auth0', '~> 2.0'
diff --git a/debian/patches/0499-92-relax-rexml.patch b/debian/patches/0499-92-relax-rexml.patch
index 55a00498ff..18a72e3eef 100644
--- a/debian/patches/0499-92-relax-rexml.patch
+++ b/debian/patches/0499-92-relax-rexml.patch
@@ -2,7 +2,7 @@ libruby2.7 has rexml 3.2.3.1 which has latest security fixes
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -28,7 +28,7 @@
+@@ -31,7 +31,7 @@
  gem 'bcrypt', '~> 3.1', '>= 3.1.14'
  gem 'doorkeeper', '~> 5.5'
  gem 'doorkeeper-openid_connect', '~> 1.7', '>= 1.7.5'
diff --git a/debian/patches/0510-remove-dev-dependencies.patch b/debian/patches/0510-remove-dev-dependencies.patch
index 6af047c557..401ac62248 100644
--- a/debian/patches/0510-remove-dev-dependencies.patch
+++ b/debian/patches/0510-remove-dev-dependencies.patch
@@ -2,12 +2,12 @@ These are not required in production
 
 --- a/package.json
 +++ b/package.json
-@@ -162,66 +162,6 @@
+@@ -189,67 +189,7 @@
      "xterm": "3.14.5"
    },
    "devDependencies": {
 -    "@babel/plugin-transform-modules-commonjs": "^7.10.1",
--    "@gitlab/eslint-plugin": "8.2.0",
+-    "@gitlab/eslint-plugin": "8.4.0",
 -    "@gitlab/stylelint-config": "2.3.0",
 -    "@testing-library/dom": "^7.16.2",
 -    "@vue/test-utils": "1.1.2",
@@ -20,9 +20,9 @@ These are not required in production
 -    "commander": "^2.18.0",
 -    "custom-jquery-matchers": "^2.1.0",
 -    "docdash": "^1.0.2",
--    "eslint": "7.24.0",
+-    "eslint": "7.26.0",
 -    "eslint-import-resolver-jest": "3.0.0",
--    "eslint-import-resolver-webpack": "0.13.0",
+-    "eslint-import-resolver-webpack": "0.13.1",
 -    "eslint-plugin-jasmine": "4.1.2",
 -    "eslint-plugin-no-jquery": "2.6.0",
 -    "gettext-extractor": "^3.5.3",
@@ -51,21 +51,23 @@ 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.24.0",
+-    "markdownlint-cli": "0.26.0",
 -    "md5": "^2.2.1",
 -    "miragejs": "^0.1.40",
--    "mock-apollo-client": "^0.5.0",
--    "node-sass": "^4.14.1",
+-    "mock-apollo-client": "^0.7.0",
 -    "nodemon": "^2.0.4",
 -    "postcss": "^7.0.14",
 -    "prettier": "2.2.1",
 -    "readdir-enhanced": "^2.2.4",
+-    "sass": "^1.32.12",
 -    "timezone-mock": "^1.0.8",
 -    "vue-jest": "4.0.1",
 -    "webpack-dev-server": "^3.11.2",
 -    "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
deleted file mode 100644
index 2592b8b7a2..0000000000
--- a/debian/patches/0520-add-system-lib-path-for-webpack.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Debian specific patch to allow webpack to resolve packaged node modules
-
---- a/config/webpack.config.js
-+++ b/config/webpack.config.js
-@@ -189,9 +189,14 @@
- 
-   resolve: {
-     extensions: ['.js', '.gql', '.graphql'],
-+    modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs'],
-     alias,
-   },
- 
-+  resolveLoader: {
-+    modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs'],
-+  },
-+
-   module: {
-     strictExportPresence: true,
-     rules: [
diff --git a/debian/patches/0700-add-salsa-link-to-help.patch b/debian/patches/0700-add-salsa-link-to-help.patch
index d1a1dfe445..de3e771bff 100644
--- a/debian/patches/0700-add-salsa-link-to-help.patch
+++ b/debian/patches/0700-add-salsa-link-to-help.patch
@@ -14,6 +14,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +      debian_tag = ENV['GITLAB_DEBIAN_VERSION'].gsub('~', '_')
 +      link_to ENV['GITLAB_DEBIAN_VERSION'], ENV['SALSA_TAG_URL'] + debian_tag
 +    elsif Gitlab.pre_release?
-       commit_link = link_to(Gitlab.revision, Gitlab::COM_URL + namespace_project_commits_path('gitlab-org', source_code_project, Gitlab.revision))
+       commit_link = link_to(Gitlab.revision, source_host_url + namespace_project_commits_path(source_code_group, source_code_project, Gitlab.revision))
        [Gitlab::VERSION, content_tag(:small, commit_link)].join(' ').html_safe
      else
diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch
index 505719818e..665b002b0e 100644
--- a/debian/patches/0740-use-packaged-modules.patch
+++ b/debian/patches/0740-use-packaged-modules.patch
@@ -37,24 +37,24 @@ Use debian packaged node modules when available
    output: {
      path: WEBPACK_OUTPUT_PATH,
      publicPath: WEBPACK_PUBLIC_PATH,
-@@ -188,13 +189,13 @@
+@@ -188,10 +189,15 @@
    },
  
    resolve: {
--    extensions: ['.js', '.gql', '.graphql'],
--    modules: ['/usr/share/gitlab/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/lib/nodejs'],
+-    extensions: ['.js'],
 +    extensions: ['.js', '.gql', '.graphql', '.json'],
 +    modules: ['node_modules','/var/lib/gitlab/node_modules','/usr/share/gitlab/vendor/node_modules','/usr/share/gitlab/node_modules/mermaid/node_modules', '/usr/share/nodejs/markdown-it/node_modules/', '/usr/lib/nodejs', '/usr/share/nodejs'],
      alias,
    },
  
-   resolveLoader: {
--    modules: ['/usr/share/gitlab/node_modules', '/usr/lib/nodejs'],
++  resolveLoader: {
 +    modules: ['node_modules','/var/lib/gitlab/node_modules', '/usr/lib/nodejs','/usr/share/nodejs'],
-   },
- 
++   },
++
    module: {
-@@ -207,9 +208,13 @@
+     strictExportPresence: true,
+     rules: [
+@@ -202,9 +208,13 @@
        },
        {
          test: /\.js$/,
@@ -69,7 +69,7 @@ Use debian packaged node modules when available
          loader: 'babel-loader',
          options: {
            cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
-@@ -286,7 +291,7 @@
+@@ -281,7 +291,7 @@
        },
        {
          test: /\.(eot|ttf|woff|woff2)$/,
@@ -78,7 +78,7 @@ Use debian packaged node modules when available
          loader: 'file-loader',
          options: {
            name: '[name].[contenthash:8].[ext]',
-@@ -581,19 +586,6 @@
+@@ -570,19 +580,6 @@
      // enable HMR only in webpack-dev-server
      DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
  
@@ -98,7 +98,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),
-@@ -630,6 +622,7 @@
+@@ -619,6 +616,7 @@
  
    node: {
      fs: 'empty', // sqljs requires fs
@@ -108,7 +108,7 @@ Use debian packaged node modules when available
  };
 --- a/package.json
 +++ b/package.json
-@@ -41,19 +41,19 @@
+@@ -43,19 +43,19 @@
      "webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js"
    },
    "dependencies": {
@@ -126,25 +126,25 @@ Use debian packaged node modules when available
 +    "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
      "@gitlab/at.js": "1.5.7",
      "@gitlab/favicon-overlay": "2.0.0",
-     "@gitlab/svgs": "1.189.0",
+     "@gitlab/svgs": "1.197.0",
      "@gitlab/tributejs": "1.0.0",
-     "@gitlab/ui": "29.6.0",
+     "@gitlab/ui": "29.27.0",
      "@gitlab/visual-review-tools": "1.6.1",
 -    "@rails/actioncable": "^6.0.3-4",
 +    "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
      "@rails/ujs": "^6.0.3-4",
      "@sentry/browser": "^5.22.3",
-     "@sourcegraph/code-host-integration": "0.0.52",
-@@ -69,7 +69,7 @@
+     "@sourcegraph/code-host-integration": "0.0.57",
+@@ -93,7 +93,7 @@
      "aws-sdk": "^2.637.0",
      "axios": "^0.20.0",
      "babel-loader": "^8.2.2",
 -    "babel-plugin-lodash": "^3.3.4",
 +    "babel-plugin-lodash": "link:/usr/share/nodejs/babel-plugin-lodash",
-     "bootstrap": "4.4.1",
+     "bootstrap": "4.5.3",
      "cache-loader": "^4.1.0",
      "clipboard": "^1.7.1",
-@@ -106,26 +106,26 @@
+@@ -129,28 +129,28 @@
      "jquery": "^3.5.0",
      "jquery.caret": "^0.3.1",
      "jquery.waitforimages": "^2.2.0",
@@ -152,13 +152,12 @@ Use debian packaged node modules when available
 -    "js-yaml": "^3.13.1",
 -    "jszip": "^3.1.3",
 -    "jszip-utils": "^0.0.2",
--    "katex": "^0.10.0",
--    "lodash": "^4.17.20",
 +    "js-cookie": "link:/usr/share/nodejs/js-cookie",
 +    "js-yaml": "link:/usr/share/nodejs/js-yaml",
 +    "jszip": "link:/usr/share/nodejs/jszip",
 +    "jszip-utils": "link:/usr/share/nodejs/jszip",
-+    "katex": "link:/usr/share/nodejs/katex",
+     "katex": "^0.13.2",
+-    "lodash": "^4.17.20",
 +    "lodash": "link:/usr/share/nodejs/lodash",
      "marked": "^0.3.12",
      "mathjax": "3",
@@ -174,16 +173,18 @@ Use debian packaged node modules when available
      "pikaday": "^1.8.0",
 -    "popper.js": "^1.16.1",
 +    "popper.js": "link:/usr/share/nodejs/popper.js",
+     "portal-vue": "^2.1.7",
      "prismjs": "^1.21.0",
+     "prosemirror-inputrules": "^1.1.3",
 -    "prosemirror-markdown": "^1.5.1",
 -    "prosemirror-model": "^1.13.3",
 +    "prosemirror-markdown": "link:/usr/share/nodejs/prosemirror-markdown",
 +    "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model",
      "raphael": "^2.2.7",
      "raw-loader": "^4.0.2",
-     "select2": "3.5.2-browserify",
-@@ -136,26 +136,25 @@
-     "style-loader": "^1.3.0",
+     "scrollparent": "^2.0.1",
+@@ -162,27 +162,26 @@
+     "style-loader": "^2.0.0",
      "swagger-ui-dist": "^3.44.1",
      "three": "^0.84.0",
 -    "three-orbit-controls": "^82.1.0",
@@ -192,7 +193,6 @@ Use debian packaged node modules when available
 -    "timeago.js": "^4.0.2",
 +    "timeago.js": "link:/usr/share/nodejs/timeago.js",
      "tiptap": "^1.32.1",
-     "tiptap-commands": "^1.17.1",
      "tiptap-extensions": "^1.35.1",
      "url-loader": "^4.1.1",
 -    "uuid": "8.1.0",
@@ -202,6 +202,8 @@ Use debian packaged node modules when available
 +    "vue": "link:/usr/share/nodejs/vue",
      "vue-apollo": "^3.0.3",
      "vue-loader": "^15.9.6",
+     "vue-observe-visibility": "^1.0.0",
+     "vue-resize": "^1.0.1",
      "vue-router": "3.4.9",
 -    "vue-template-compiler": "^2.6.12",
 +    "vue-template-compiler": "link:/usr/share/nodejs/vue-template-compiler",
@@ -210,7 +212,7 @@ Use debian packaged node modules when available
      "vuex": "^3.6.0",
      "web-vitals": "^0.2.4",
      "webpack": "^4.46.0",
--    "webpack-bundle-analyzer": "^4.4.1",
+-    "webpack-bundle-analyzer": "^4.4.2",
      "webpack-cli": "^3.3.12",
      "webpack-stats-plugin": "^0.3.1",
      "worker-loader": "^2.0.0",
diff --git a/debian/patches/series b/debian/patches/series
index e23b177fe9..a166c848ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,7 +8,6 @@
 0480-embed-elasticsearch-model.patch
 0480-embed-elasticsearch-rails.patch
 0482-remove-ee-only-gems.patch
-0484-relax-grape-entity.patch
 0485-relax-gitlab-sidekiq-fetcher.patch
 0486-relax-sidekiq.patch
 0499-10-relax-capybara.patch
@@ -21,7 +20,6 @@
 0499-92-relax-rexml.patch
 0500-set-webpack-root.patch
 0510-remove-dev-dependencies.patch
-0520-add-system-lib-path-for-webpack.patch
 0610-source-init-functions.patch
 0620-pid-log-paths.patch
 0630-fix-mail-room-path.patch