From 7df15b85166f408271f48a3ec9b17f357143564e Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Wed, 2 Mar 2022 13:35:08 +0530
Subject: [PATCH] Refresh patches (remove patches applied upstream)

---
 debian/patches/0180-relax-sanitize.patch      | 11 ---
 .../Gemfile/0010-relax-stable-libs.patch      | 77 +++++++++----------
 .../0020-remove-development-test.patch        | 14 ++--
 ...0-make-test-dependencies-conditional.patch |  6 +-
 .../patches/Gemfile/0040-relax-httparty.patch |  2 +-
 debian/patches/Gemfile/0050-relax-rdoc.patch  |  2 +-
 .../Gemfile/0060-remove-gitlab-markup.patch   |  2 +-
 .../0070-embed-elasticsearch-model.patch      |  2 +-
 .../0080-embed-elasticsearch-rails.patch      |  2 +-
 .../Gemfile/0090-remove-ee-only-gems.patch    |  2 +-
 .../patches/Gemfile/0120-relax-capybara.patch |  2 +-
 .../0130-remove-capybara-screenshot.patch     |  2 +-
 .../Gemfile/0140-remove-guard-rspec.patch     |  2 +-
 .../Gemfile/0150-relax-graphlient.patch       |  6 +-
 .../Gemfile/0170-relax-ipynbdiff.patch        |  2 +-
 .../nodejs/0010-set-webpack-root.patch        |  2 +-
 .../nodejs/0020-remove-dev-dependencies.patch |  7 +-
 .../nodejs/0040-use-packaged-modules.patch    | 34 ++++----
 debian/patches/series                         |  2 -
 .../tweaks/0020-fix-mail-room-path.patch      |  2 +-
 .../tweaks/0050-add-salsa-link-to-help.patch  |  2 +-
 .../0090-require-sidekiq-job-logger.patch     | 15 ----
 22 files changed, 83 insertions(+), 115 deletions(-)
 delete mode 100644 debian/patches/0180-relax-sanitize.patch
 delete mode 100644 debian/patches/tweaks/0090-require-sidekiq-job-logger.patch

diff --git a/debian/patches/0180-relax-sanitize.patch b/debian/patches/0180-relax-sanitize.patch
deleted file mode 100644
index c09d29fd4d..0000000000
--- a/debian/patches/0180-relax-sanitize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -258,7 +258,7 @@
- gem 'kubeclient', '~> 4.9','>= 4.9.2'
- 
- # Sanitize user input
--gem 'sanitize', '~> 5.2','>= 5.2.1'
-+gem 'sanitize', '~> 6.0'
- gem 'babosa', '~> 1.0','>= 1.0.4'
- 
- # Sanitizes SVG input
diff --git a/debian/patches/Gemfile/0010-relax-stable-libs.patch b/debian/patches/Gemfile/0010-relax-stable-libs.patch
index 1a4f64ff3a..fa3679676b 100644
--- a/debian/patches/Gemfile/0010-relax-stable-libs.patch
+++ b/debian/patches/Gemfile/0010-relax-stable-libs.patch
@@ -7,8 +7,8 @@ gitlab Gemfile
  
  source 'https://rubygems.org'
  
--gem 'rails', '~> 6.1.4.1'
-+gem 'rails', '~> 6.1.4', '>= 6.1.4.1'
+-gem 'rails', '~> 6.1.4.4'
++gem 'rails', '~> 6.1.4', '>= 6.1.4.4'
  
 -gem 'bootsnap', '~> 1.9.1', require: false
 +gem 'bootsnap', '~> 1.9', '>= 1.9.1', require: false
@@ -73,7 +73,7 @@ gitlab Gemfile
 -gem 'omniauth_crowd', '~> 2.4.0'
 +gem 'omniauth_crowd', '~> 2.4'
  gem 'omniauth-authentiq', '~> 0.3.3'
- gem 'gitlab-omniauth-openid-connect', '~> 0.8.0', require: 'omniauth_openid_connect'
+ gem 'gitlab-omniauth-openid-connect', '~> 0.9.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'
@@ -105,7 +105,7 @@ gitlab Gemfile
 +gem 'validates_hostname', '~> 1.0', '>= 1.0.11'
 +gem 'rubyzip', '~> 2.0', require: 'zip'
  # GitLab Pages letsencrypt support
- gem 'acme-client', '~> 2.0', '>= 2.0.6'
+ gem 'acme-client', '~> 2.0', '>= 2.0.9'
  
 @@ -83,7 +83,7 @@
  gem 'ohai', '~> 16.10'
@@ -116,7 +116,7 @@ gitlab Gemfile
  
  # LDAP Auth
  # GitLab fork with several improvements to original library. For full list of changes
-@@ -92,17 +92,17 @@
+@@ -92,14 +92,14 @@
  gem 'net-ldap', '~> 0.16.3'
  
  # API
@@ -129,17 +129,13 @@ gitlab Gemfile
  # GraphQL API
 -gem 'graphql', '~> 1.11.10'
 +gem 'graphql', '~> 1.11', '>= 1.11.10'
- # NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab/issues/31771
- # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released:
- # https://gitlab.com/gitlab-org/gitlab/issues/31747
--gem 'graphiql-rails', '~> 1.4.10'
+ gem 'graphiql-rails', '~> 1.8'
 -gem 'apollo_upload_server', '~> 2.1.0'
-+gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
 +gem 'apollo_upload_server', '~> 2.1'
  gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
  gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
  
-@@ -114,23 +114,23 @@
+@@ -111,23 +111,23 @@
  gem 'kaminari', '~> 1.0'
  
  # HAML
@@ -167,7 +163,7 @@ gitlab Gemfile
  
  # for Google storage
  gem 'google-api-client', '~> 0.33'
-@@ -139,37 +139,37 @@
+@@ -136,37 +136,37 @@
  gem 'unf', '~> 0.1.4'
  
  # Seed data
@@ -183,6 +179,8 @@ gitlab Gemfile
  gem 'aws-sdk-cloudformation', '~> 1'
  gem 'aws-sdk-s3', '~> 1'
  gem 'faraday_middleware-aws-sigv4', '~>0.3.0'
+-gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections
++gem 'typhoeus', '~> 1.4' # Used with Elasticsearch to support http keep-alive connections
  
  # Markdown and HTML processing
 -gem 'html-pipeline', '~> 2.13.2'
@@ -213,13 +211,11 @@ gitlab Gemfile
 +gem 'rouge', '~> 3.27'
  gem 'truncato', '~> 0.7.11'
 -gem 'bootstrap_form', '~> 4.2.0'
--gem 'nokogiri', '~> 1.11.4'
 +gem 'bootstrap_form', '~> 4.2'
-+gem 'nokogiri', '~> 1.11','>= 1.11.4'
+ gem 'nokogiri', '~> 1.12'
  gem 'escape_utils', '~> 1.1'
  
- # Calendar rendering
-@@ -180,12 +180,12 @@
+@@ -178,12 +178,12 @@
  gem 'diff_match_patch', '~> 0.1.0'
  
  # Application server
@@ -234,10 +230,10 @@ gitlab Gemfile
    gem 'puma_worker_killer', '~> 0.3.1', require: false
    gem 'sd_notify', '~> 0.1.0', require: false
  end
-@@ -199,11 +199,11 @@
+@@ -197,11 +197,11 @@
  # Background jobs
  gem 'sidekiq', '~> 6.3'
- gem 'sidekiq-cron', '~> 1.0'
+ gem 'sidekiq-cron', '~> 1.2'
 -gem 'redis-namespace', '~> 1.8.1'
 +gem 'redis-namespace', '~> 1.8','>= 1.8.1'
  gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch'
@@ -248,7 +244,7 @@ gitlab Gemfile
  
  # HTTP requests
  gem 'httparty', '~> 0.16.4'
-@@ -215,14 +215,14 @@
+@@ -213,14 +213,14 @@
  gem 'ruby-progressbar', '~> 1.10'
  
  # GitLab settings
@@ -266,7 +262,7 @@ gitlab Gemfile
  
  # Export Ruby Regex to Javascript
  gem 'js_regex', '~> 3.7'
-@@ -231,24 +231,24 @@
+@@ -229,24 +229,24 @@
  gem 'device_detector'
  
  # Redis
@@ -295,7 +291,7 @@ gitlab Gemfile
  
  # Hangouts Chat integration
  gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
-@@ -260,17 +260,17 @@
+@@ -258,17 +258,17 @@
  gem 'ruby-fogbugz', '~> 0.2.1'
  
  # Kubernetes integration
@@ -303,9 +299,8 @@ gitlab Gemfile
 +gem 'kubeclient', '~> 4.9','>= 4.9.2'
  
  # Sanitize user input
--gem 'sanitize', '~> 5.2.1'
+ gem 'sanitize', '~> 6.0'
 -gem 'babosa', '~> 1.0.4'
-+gem 'sanitize', '~> 5.2','>= 5.2.1'
 +gem 'babosa', '~> 1.0','>= 1.0.4'
  
  # Sanitizes SVG input
@@ -317,7 +312,7 @@ gitlab Gemfile
  
  # Detect and convert string character encoding
  gem 'charlock_holmes', '~> 0.7.7'
-@@ -287,20 +287,20 @@
+@@ -285,20 +285,20 @@
  
  gem 'rack-proxy', '~> 0.6.0'
  
@@ -343,7 +338,7 @@ gitlab Gemfile
  
  # Sentry integration
  gem 'sentry-raven', '~> 3.1'
-@@ -309,7 +309,7 @@
+@@ -307,7 +307,7 @@
  #
  gem 'pg_query', '~> 2.1'
  
@@ -351,8 +346,8 @@ gitlab Gemfile
 +gem 'premailer-rails', '~> 1.10','>=  1.10.3'
  
  # LabKit: Tracing and Correlation
- gem 'gitlab-labkit', '~> 0.21.1'
-@@ -320,11 +320,11 @@
+ gem 'gitlab-labkit', '~> 0.21.3'
+@@ -318,11 +318,11 @@
  # I18n
  gem 'ruby_parser', '~> 3.15', require: false
  gem 'rails-i18n', '~> 6.0'
@@ -366,7 +361,7 @@ gitlab Gemfile
  
  # Perf bar
  gem 'peek', '~> 1.1'
-@@ -334,10 +334,10 @@
+@@ -332,10 +332,10 @@
  
  # Metrics
  gem 'method_source', '~> 1.0', require: false
@@ -379,7 +374,7 @@ gitlab Gemfile
  
  group :development do
    gem 'lefthook', '~> 0.7.0', require: false
-@@ -419,18 +419,18 @@
+@@ -415,18 +415,18 @@
  end
  
  group :test do
@@ -406,7 +401,7 @@ gitlab Gemfile
    gem 'rails-controller-testing'
    gem 'concurrent-ruby', '~> 1.1'
    gem 'test-prof', '~> 1.0.7'
-@@ -449,7 +449,7 @@
+@@ -446,7 +446,7 @@
  gem 'email_reply_trimmer', '~> 0.1'
  gem 'html2text'
  
@@ -415,7 +410,7 @@ gitlab Gemfile
  gem 'stackprof', '~> 0.2.15', require: false
  gem 'rbtrace', '~> 0.4', require: false
  gem 'memory_profiler', '~> 0.9', require: false
-@@ -463,8 +463,8 @@
+@@ -460,8 +460,8 @@
  gem 'health_check', '~> 3.0'
  
  # System information
@@ -426,25 +421,25 @@ gitlab Gemfile
  
  # NTP client
  gem 'net-ntp'
-@@ -483,14 +483,14 @@
+@@ -480,14 +480,14 @@
  gem 'spamcheck', '~> 0.1.0'
  
  # Gitaly GRPC protocol definitions
--gem 'gitaly', '~> 14.4.0.pre.rc43'
-+gem 'gitaly', '~> 14.4'
+-gem 'gitaly', '~> 14.6.0.pre.rc1'
++gem 'gitaly', '~> 14.6'
  
  # KAS GRPC protocol definitions
  gem 'kas-grpc', '~> 0.0.2'
  
--gem 'grpc', '~> 1.30.2'
-+gem 'grpc', '~> 1.30', '>= 1.30.2'
+-gem 'grpc', '~> 1.42.0'
++gem 'grpc', '~> 1.42'
  
--gem 'google-protobuf', '~> 3.17.1'
-+gem 'google-protobuf', '~> 3.17', '>= 3.17.1'
+-gem 'google-protobuf', '~> 3.19.0'
++gem 'google-protobuf', '~> 3.19'
  
  gem 'toml-rb', '~> 2.0'
  
-@@ -498,7 +498,7 @@
+@@ -495,7 +495,7 @@
  gem 'flipper', '~> 0.21.0'
  gem 'flipper-active_record', '~> 0.21.0'
  gem 'flipper-active_support_cache_store', '~> 0.21.0'
@@ -453,7 +448,7 @@ gitlab Gemfile
  gem 'gitlab-experiment', '~> 0.6.5'
  
  # Structured logging
-@@ -511,12 +511,12 @@
+@@ -508,12 +508,12 @@
  # Countries list
  gem 'countries', '~> 3.0'
  
@@ -468,7 +463,7 @@ gitlab Gemfile
  
  # Locked as long as quoted-printable encoding issues are not resolved
  # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
-@@ -531,11 +531,11 @@
+@@ -528,11 +528,11 @@
  gem 'valid_email', '~> 0.1'
  
  # JSON
diff --git a/debian/patches/Gemfile/0020-remove-development-test.patch b/debian/patches/Gemfile/0020-remove-development-test.patch
index 70487eb85f..96b9aaab70 100644
--- a/debian/patches/Gemfile/0020-remove-development-test.patch
+++ b/debian/patches/Gemfile/0020-remove-development-test.patch
@@ -2,15 +2,15 @@ Bundler will fail when it can't find these locally
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -103,7 +103,6 @@
- # https://gitlab.com/gitlab-org/gitlab/issues/31747
- gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
+@@ -100,7 +100,6 @@
+ gem 'graphql', '~> 1.11', '>= 1.11.10'
+ gem 'graphiql-rails', '~> 1.8'
  gem 'apollo_upload_server', '~> 2.1'
 -gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
  gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
  
  gem 'hashie'
-@@ -322,7 +321,6 @@
+@@ -320,7 +319,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', '~> 2.0', '>= 2.0.1'
  
-@@ -339,21 +337,6 @@
+@@ -337,21 +335,6 @@
  
  gem 'warning', '~> 1.2'
  
@@ -40,7 +40,7 @@ Bundler will fail when it can't find these locally
  group :development, :test do
    gem 'deprecation_toolkit', '~> 1.5.1', require: false
    gem 'bullet', '~> 6.1.3'
-@@ -376,9 +359,6 @@
+@@ -374,9 +357,6 @@
    gem 'spring', '~> 2.1.0'
    gem 'spring-commands-rspec', '~> 1.0.4'
  
@@ -50,7 +50,7 @@ Bundler will fail when it can't find these locally
    gem 'bundler-audit', '~> 0.7.0.1', require: false
  
    gem 'benchmark-ips', '~> 2.3.0', require: false
-@@ -399,25 +379,6 @@
+@@ -395,25 +375,6 @@
    gem 'test_file_finder', '~> 0.1.3'
  end
  
diff --git a/debian/patches/Gemfile/0030-make-test-dependencies-conditional.patch b/debian/patches/Gemfile/0030-make-test-dependencies-conditional.patch
index dae8a3c3d2..6b2aa9fdc2 100644
--- a/debian/patches/Gemfile/0030-make-test-dependencies-conditional.patch
+++ b/debian/patches/Gemfile/0030-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
-@@ -337,7 +337,7 @@
+@@ -335,7 +335,7 @@
  
  gem 'warning', '~> 1.2'
  
@@ -11,8 +11,8 @@ Make test dependencies conditional so we can enable them when running autopkgtes
    gem 'deprecation_toolkit', '~> 1.5.1', require: false
    gem 'bullet', '~> 6.1.3'
    gem 'pry-byebug'
-@@ -377,9 +377,7 @@
-   gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
+@@ -373,9 +373,7 @@
+   gem 'parallel', '~> 1.19', require: false
  
    gem 'test_file_finder', '~> 0.1.3'
 -end
diff --git a/debian/patches/Gemfile/0040-relax-httparty.patch b/debian/patches/Gemfile/0040-relax-httparty.patch
index 9c18a98adb..1bd290cca8 100644
--- a/debian/patches/Gemfile/0040-relax-httparty.patch
+++ b/debian/patches/Gemfile/0040-relax-httparty.patch
@@ -2,7 +2,7 @@ Allow newer versions of httparty to satisfy dependency
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -205,7 +205,7 @@
+@@ -203,7 +203,7 @@
  gem 'fugit', '~> 1.2','>= 1.2.1'
  
  # HTTP requests
diff --git a/debian/patches/Gemfile/0050-relax-rdoc.patch b/debian/patches/Gemfile/0050-relax-rdoc.patch
index 285582f165..5c7f4ec7bd 100644
--- a/debian/patches/Gemfile/0050-relax-rdoc.patch
+++ b/debian/patches/Gemfile/0050-relax-rdoc.patch
@@ -2,7 +2,7 @@ Allow rdoc from ruby 2.5 to match requirement
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -157,7 +157,7 @@
+@@ -155,7 +155,7 @@
  gem 'commonmarker', '~> 0.23.2'
  gem 'kramdown', '~> 2.3','>= 2.3.1'
  gem 'RedCloth', '~> 4.3','>= 4.3.2'
diff --git a/debian/patches/Gemfile/0060-remove-gitlab-markup.patch b/debian/patches/Gemfile/0060-remove-gitlab-markup.patch
index 0a4e113fbe..82f4cefa58 100644
--- a/debian/patches/Gemfile/0060-remove-gitlab-markup.patch
+++ b/debian/patches/Gemfile/0060-remove-gitlab-markup.patch
@@ -4,7 +4,7 @@ maintaining two almost same packages.
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -152,7 +152,6 @@
+@@ -150,7 +150,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/Gemfile/0070-embed-elasticsearch-model.patch b/debian/patches/Gemfile/0070-embed-elasticsearch-model.patch
index 6f726562da..e50a71c622 100644
--- a/debian/patches/Gemfile/0070-embed-elasticsearch-model.patch
+++ b/debian/patches/Gemfile/0070-embed-elasticsearch-model.patch
@@ -2,7 +2,7 @@ Embed this gem until gitlab moved to 7.x version
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -141,7 +141,7 @@
+@@ -138,7 +138,7 @@
  gem 'seed-fu', '~> 2.3','>= 2.3.7'
  
  # Search
diff --git a/debian/patches/Gemfile/0080-embed-elasticsearch-rails.patch b/debian/patches/Gemfile/0080-embed-elasticsearch-rails.patch
index 39f5ea40a7..1998aaebd9 100644
--- a/debian/patches/Gemfile/0080-embed-elasticsearch-rails.patch
+++ b/debian/patches/Gemfile/0080-embed-elasticsearch-rails.patch
@@ -2,7 +2,7 @@ Embed this gem until gitlab moved to 7.x version
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -142,7 +142,7 @@
+@@ -139,7 +139,7 @@
  
  # Search
  gem 'elasticsearch-model', '~> 6.1', path: 'vendor/gems/elasticsearch-model'
diff --git a/debian/patches/Gemfile/0090-remove-ee-only-gems.patch b/debian/patches/Gemfile/0090-remove-ee-only-gems.patch
index 43616910d6..9af67d993f 100644
--- a/debian/patches/Gemfile/0090-remove-ee-only-gems.patch
+++ b/debian/patches/Gemfile/0090-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'
-@@ -295,8 +292,6 @@
+@@ -293,8 +290,6 @@
  gem 'request_store', '~> 1.5'
  gem 'base32', '~> 0.3.0'
  
diff --git a/debian/patches/Gemfile/0120-relax-capybara.patch b/debian/patches/Gemfile/0120-relax-capybara.patch
index 4957e3b91e..dda499c457 100644
--- a/debian/patches/Gemfile/0120-relax-capybara.patch
+++ b/debian/patches/Gemfile/0120-relax-capybara.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -377,7 +377,7 @@
+@@ -373,7 +373,7 @@
    gem 'rspec_profiling', '~> 0.0.6'
    gem 'rspec-parameterized', require: false
  
diff --git a/debian/patches/Gemfile/0130-remove-capybara-screenshot.patch b/debian/patches/Gemfile/0130-remove-capybara-screenshot.patch
index 53a49ad5b3..2298cf8bd9 100644
--- a/debian/patches/Gemfile/0130-remove-capybara-screenshot.patch
+++ b/debian/patches/Gemfile/0130-remove-capybara-screenshot.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -378,7 +378,6 @@
+@@ -374,7 +374,6 @@
    gem 'rspec-parameterized', require: false
  
    gem 'capybara', '~> 3.12'
diff --git a/debian/patches/Gemfile/0140-remove-guard-rspec.patch b/debian/patches/Gemfile/0140-remove-guard-rspec.patch
index 27fe1071c6..52c2cfff73 100644
--- a/debian/patches/Gemfile/0140-remove-guard-rspec.patch
+++ b/debian/patches/Gemfile/0140-remove-guard-rspec.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -387,7 +387,6 @@
+@@ -383,7 +383,6 @@
    gem 'concurrent-ruby', '~> 1.1'
    gem 'test-prof', '~> 1.0.7'
    gem 'rspec_junit_formatter'
diff --git a/debian/patches/Gemfile/0150-relax-graphlient.patch b/debian/patches/Gemfile/0150-relax-graphlient.patch
index 3446bb956a..0d9ea0fc83 100644
--- a/debian/patches/Gemfile/0150-relax-graphlient.patch
+++ b/debian/patches/Gemfile/0150-relax-graphlient.patch
@@ -2,9 +2,9 @@ newer version is in the archive
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -100,7 +100,7 @@
- # https://gitlab.com/gitlab-org/gitlab/issues/31747
- gem 'graphiql-rails', '~> 1.4', '>= 1.4.10'
+@@ -97,7 +97,7 @@
+ gem 'graphql', '~> 1.11', '>= 1.11.10'
+ gem 'graphiql-rails', '~> 1.8'
  gem 'apollo_upload_server', '~> 2.1'
 -gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import)
 +gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
diff --git a/debian/patches/Gemfile/0170-relax-ipynbdiff.patch b/debian/patches/Gemfile/0170-relax-ipynbdiff.patch
index 7f55c83fad..507b22e649 100644
--- a/debian/patches/Gemfile/0170-relax-ipynbdiff.patch
+++ b/debian/patches/Gemfile/0170-relax-ipynbdiff.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -495,4 +495,4 @@
+@@ -492,4 +492,4 @@
  
  gem 'parslet', '~> 1.8'
  
diff --git a/debian/patches/nodejs/0010-set-webpack-root.patch b/debian/patches/nodejs/0010-set-webpack-root.patch
index 29cff8c4b5..52a0db2bc7 100644
--- a/debian/patches/nodejs/0010-set-webpack-root.patch
+++ b/debian/patches/nodejs/0010-set-webpack-root.patch
@@ -2,7 +2,7 @@ Debian specific patch to help webpack find sources
 
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -26,7 +26,7 @@
+@@ -28,7 +28,7 @@
  const MonacoWebpackPlugin = require('./plugins/monaco_webpack');
  const GraphqlKnownOperationsPlugin = require('./plugins/graphql_known_operations_plugin');
  
diff --git a/debian/patches/nodejs/0020-remove-dev-dependencies.patch b/debian/patches/nodejs/0020-remove-dev-dependencies.patch
index c6cb7950c8..b5b5cf20a5 100644
--- a/debian/patches/nodejs/0020-remove-dev-dependencies.patch
+++ b/debian/patches/nodejs/0020-remove-dev-dependencies.patch
@@ -2,16 +2,16 @@ These are not required in production
 
 --- a/package.json
 +++ b/package.json
-@@ -206,61 +206,7 @@
+@@ -207,62 +207,7 @@
      "yaml": "^2.0.0-8"
    },
    "devDependencies": {
 -    "@babel/plugin-transform-modules-commonjs": "^7.10.1",
 -    "@gitlab/eslint-plugin": "10.0.0",
 -    "@gitlab/stylelint-config": "2.6.0",
--    "@graphql-eslint/eslint-plugin": "2.3.0",
+-    "@graphql-eslint/eslint-plugin": "3.0.0",
 -    "@testing-library/dom": "^7.16.2",
--    "@vue/test-utils": "1.2.0",
+-    "@vue/test-utils": "1.3.0",
 -    "acorn": "^6.3.0",
 -    "axios-mock-adapter": "^1.15.0",
 -    "babel-jest": "^26.5.2",
@@ -34,6 +34,7 @@ These are not required in production
 -    "istanbul-reports": "^3.0.0",
 -    "jest": "^26.5.2",
 -    "jest-canvas-mock": "^2.1.2",
+-    "jest-diff": "^27.4.6",
 -    "jest-environment-jsdom": "^26.5.2",
 -    "jest-junit": "^12.0.0",
 -    "jest-raw-loader": "^1.0.1",
diff --git a/debian/patches/nodejs/0040-use-packaged-modules.patch b/debian/patches/nodejs/0040-use-packaged-modules.patch
index 954f703864..0b48952131 100644
--- a/debian/patches/nodejs/0040-use-packaged-modules.patch
+++ b/debian/patches/nodejs/0040-use-packaged-modules.patch
@@ -19,7 +19,7 @@ Use debian packaged node modules when available
 
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -14,7 +14,6 @@
+@@ -16,7 +16,6 @@
  const VUE_VERSION = require('vue/package.json').version;
  
  const webpack = require('webpack');
@@ -27,7 +27,7 @@ Use debian packaged node modules when available
  const { StatsWriterPlugin } = require('webpack-stats-plugin');
  const WEBPACK_VERSION = require('webpack/package.json').version;
  
-@@ -233,6 +232,8 @@
+@@ -236,6 +235,8 @@
  
    entry: generateEntries,
  
@@ -36,7 +36,7 @@ Use debian packaged node modules when available
    output: {
      path: WEBPACK_OUTPUT_PATH,
      publicPath: WEBPACK_PUBLIC_PATH,
-@@ -242,10 +243,15 @@
+@@ -245,10 +246,15 @@
    },
  
    resolve: {
@@ -53,7 +53,7 @@ Use debian packaged node modules when available
    module: {
      strictExportPresence: true,
      rules: [
-@@ -256,9 +262,13 @@
+@@ -259,9 +265,13 @@
        },
        {
          test: /\.js$/,
@@ -68,7 +68,7 @@ Use debian packaged node modules when available
          loader: 'babel-loader',
          options: {
            cacheDirectory: path.join(CACHE_PATH, 'babel-loader'),
-@@ -345,7 +355,7 @@
+@@ -348,7 +358,7 @@
        },
        {
          test: /\.(eot|ttf|woff|woff2)$/,
@@ -77,7 +77,7 @@ Use debian packaged node modules when available
          loader: 'file-loader',
          options: {
            name: '[name].[contenthash:8].[ext]',
-@@ -655,19 +665,6 @@
+@@ -658,19 +668,6 @@
      // enable HMR only in webpack-dev-server
      DEV_SERVER_LIVERELOAD && new webpack.HotModuleReplacementPlugin(),
  
@@ -97,7 +97,7 @@ Use debian packaged node modules when available
      new webpack.DefinePlugin({
        // These are used to define window.gon.ee, window.gon.jh and other things properly in tests:
        'process.env.IS_EE': JSON.stringify(IS_EE),
-@@ -706,6 +703,7 @@
+@@ -709,6 +706,7 @@
  
    node: {
      fs: 'empty', // sqljs requires fs
@@ -107,8 +107,8 @@ Use debian packaged node modules when available
  };
 --- a/package.json
 +++ b/package.json
-@@ -47,19 +47,19 @@
-     "webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js"
+@@ -48,19 +48,19 @@
+     "webpack-prod-node-latest": "NODE_OPTIONS=\"--max-old-space-size=3584 --openssl-legacy-provider\" NODE_ENV=production webpack --config config/webpack.config.js"
    },
    "dependencies": {
 -    "@babel/core": "^7.10.1",
@@ -125,16 +125,16 @@ 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": "2.0.0",
+     "@gitlab/svgs": "2.2.0",
      "@gitlab/tributejs": "1.0.0",
-     "@gitlab/ui": "32.50.0",
+     "@gitlab/ui": "32.68.0",
      "@gitlab/visual-review-tools": "1.6.1",
 -    "@rails/actioncable": "6.1.4-1",
 +    "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
      "@rails/ujs": "6.1.4-1",
      "@sentry/browser": "5.30.0",
      "@sourcegraph/code-host-integration": "0.0.60",
-@@ -106,7 +106,7 @@
+@@ -107,7 +107,7 @@
      "aws-sdk": "^2.637.0",
      "axios": "^0.24.0",
      "babel-loader": "^8.2.2",
@@ -143,7 +143,7 @@ Use debian packaged node modules when available
      "bootstrap": "4.5.3",
      "cache-loader": "^4.1.0",
      "canvas-confetti": "^1.4.0",
-@@ -141,30 +141,30 @@
+@@ -142,30 +142,30 @@
      "jed": "^1.1.1",
      "jquery": "^3.6.0",
      "jquery.caret": "^0.3.1",
@@ -177,16 +177,16 @@ Use debian packaged node modules when available
 +    "popper.js": "link:/usr/share/nodejs/popper.js",
      "portal-vue": "^2.1.7",
      "prismjs": "^1.21.0",
--    "prosemirror-markdown": "^1.6.0",
--    "prosemirror-model": "^1.15.0",
+-    "prosemirror-markdown": "1.6.0",
+-    "prosemirror-model": "^1.16.1",
 -    "prosemirror-state": "^1.3.4",
 +    "prosemirror-markdown": "link:/usr/share/nodejs/prosemirror-markdown",
 +    "prosemirror-model": "link:/usr/share/nodejs/prosemirror-model",
 +    "prosemirror-state": "link:/usr/share/nodejs/prosemirror-state",
      "prosemirror-tables": "^1.1.1",
-     "prosemirror-view": "^1.23.3",
+     "prosemirror-view": "^1.23.5",
      "raphael": "^2.2.7",
-@@ -178,27 +178,26 @@
+@@ -179,27 +179,26 @@
      "style-loader": "^2.0.0",
      "swagger-ui-dist": "^3.52.3",
      "three": "^0.84.0",
diff --git a/debian/patches/series b/debian/patches/series
index cf1bf09f94..d006988eff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,7 +13,6 @@ Gemfile/0140-remove-guard-rspec.patch
 Gemfile/0150-relax-graphlient.patch
 Gemfile/0160-relax-rexml.patch
 Gemfile/0170-relax-ipynbdiff.patch
-0180-relax-sanitize.patch
 nodejs/0010-set-webpack-root.patch
 nodejs/0020-remove-dev-dependencies.patch
 nodejs/0030-use-yarnpkg.patch
@@ -27,4 +26,3 @@ tweaks/0050-add-salsa-link-to-help.patch
 tweaks/0060-fix-relative-paths.patch
 tweaks/0070-remove-capybara-screenshot-rspec.patch
 tweaks/0080-search-binaries-in-path.patch
-tweaks/0090-require-sidekiq-job-logger.patch
diff --git a/debian/patches/tweaks/0020-fix-mail-room-path.patch b/debian/patches/tweaks/0020-fix-mail-room-path.patch
index 229cfa325b..bd0ec3d69b 100644
--- a/debian/patches/tweaks/0020-fix-mail-room-path.patch
+++ b/debian/patches/tweaks/0020-fix-mail-room-path.patch
@@ -7,6 +7,6 @@ require_relative does not work with debian package layout
    <%
 -    require_relative "../lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom)
 +    require "/usr/share/gitlab/lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom)
-     Gitlab::MailRoom.enabled_configs.each do |config|
+     Gitlab::MailRoom.enabled_configs.each do |_key, config|
    %>
      -
diff --git a/debian/patches/tweaks/0050-add-salsa-link-to-help.patch b/debian/patches/tweaks/0050-add-salsa-link-to-help.patch
index de3e771bff..89b489875c 100644
--- a/debian/patches/tweaks/0050-add-salsa-link-to-help.patch
+++ b/debian/patches/tweaks/0050-add-salsa-link-to-help.patch
@@ -5,7 +5,7 @@ Last-Update: 2018-12-16
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/app/helpers/version_check_helper.rb
 +++ b/app/helpers/version_check_helper.rb
-@@ -10,7 +10,10 @@
+@@ -9,7 +9,10 @@
    end
  
    def link_to_version
diff --git a/debian/patches/tweaks/0090-require-sidekiq-job-logger.patch b/debian/patches/tweaks/0090-require-sidekiq-job-logger.patch
deleted file mode 100644
index ae4fc0c9f1..0000000000
--- a/debian/patches/tweaks/0090-require-sidekiq-job-logger.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes Unable to load application: NameError: uninitialized constant Sidekiq::JobLogger"}
-when starting gitlab-puma service
-
-Possibly because we have sidekiq 6.3.1 and upstream uses 6.2.2
-
---- a/lib/gitlab/sidekiq_logging/structured_logger.rb
-+++ b/lib/gitlab/sidekiq_logging/structured_logger.rb
-@@ -2,6 +2,7 @@
- 
- require 'active_record'
- require 'active_record/log_subscriber'
-+require 'sidekiq/job_logger'
- 
- module Gitlab
-   module SidekiqLogging