From 93c1e6d67dabdeb0cba0bc77225577e7379900ce Mon Sep 17 00:00:00 2001
From: Mohammed Bilal <mdbilal@disroot.org>
Date: Thu, 12 Jan 2023 18:47:06 +0000
Subject: [PATCH] Refresh patches

---
 .../Gemfile/0010-relax-stable-libs.patch      | 134 +++++++++---------
 .../0020-remove-development-test.patch        |  12 +-
 ...0-make-test-dependencies-conditional.patch |   2 +-
 .../patches/Gemfile/0040-relax-httparty.patch |   8 +-
 debian/patches/Gemfile/0050-relax-rdoc.patch  |   2 +-
 .../Gemfile/0090-remove-ee-only-gems.patch    |   4 +-
 .../patches/Gemfile/0120-relax-capybara.patch |   2 +-
 .../0130-remove-capybara-screenshot.patch     |   2 +-
 .../Gemfile/0140-remove-guard-rspec.patch     |   2 +-
 debian/patches/Gemfile/0190-relax-rdoc.patch  |   2 +-
 .../Gemfile/0200-add-gitlab-dangerfiles.patch |   8 +-
 .../Gemfile/0220-relax-gitlab-labkit.patch    |   6 +-
 .../nodejs/0020-remove-dev-dependencies.patch |  12 +-
 .../nodejs/0040-use-packaged-modules.patch    |  10 +-
 .../nodejs/0050-add-babel-plugins.patch       |   2 +-
 .../patches/nodejs/0060-use-system-yaml.patch |   4 +-
 .../nodejs/0070-use-system-katex.patch        |   2 +-
 17 files changed, 105 insertions(+), 109 deletions(-)

diff --git a/debian/patches/Gemfile/0010-relax-stable-libs.patch b/debian/patches/Gemfile/0010-relax-stable-libs.patch
index 49260d1f8e..3ac898b31a 100644
--- a/debian/patches/Gemfile/0010-relax-stable-libs.patch
+++ b/debian/patches/Gemfile/0010-relax-stable-libs.patch
@@ -22,8 +22,8 @@ gitlab Gemfile
 -gem 'sprockets', '~> 3.7.0'
 +gem 'sprockets', '~> 3.7'
  
--gem 'view_component', '~> 2.71.0'
-+gem 'view_component', '~> 2.71'
+-gem 'view_component', '~> 2.74.1'
++gem 'view_component', '~> 2.74'
  
  # Default values for AR models
 -gem 'default_value_for', '~> 3.4.0'
@@ -80,8 +80,7 @@ gitlab Gemfile
 +gem 'omniauth-saml', '~> 2.0'
 +gem 'omniauth-shibboleth', '~> 1.3'
  gem 'omniauth-twitter', '~> 1.4'
--gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
-+gem 'omniauth_crowd', '~> 2.4', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
+ gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md
  gem 'omniauth-authentiq', '~> 0.3.3'
  gem 'gitlab-omniauth-openid-connect', '~> 0.10.0', require: 'omniauth_openid_connect'
  gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md
@@ -97,8 +96,8 @@ gitlab Gemfile
  # Spam and anti-bot protection
  gem 'recaptcha', '~> 4.11', require: 'recaptcha/rails'
  gem 'akismet', '~> 3.0'
--gem 'invisible_captcha', '~> 1.1.0'
-+gem 'invisible_captcha', '~> 1.1'
+-gem 'invisible_captcha', '~> 2.0.0'
++gem 'invisible_captcha', '~> 2.0'
  
  # Two-factor authentication
 -gem 'devise-two-factor', '~> 4.0.2'
@@ -110,7 +109,7 @@ gitlab Gemfile
  # GitLab Pages
 -gem 'validates_hostname', '~> 1.0.11'
 -gem 'rubyzip', '~> 2.3.2', require: 'zip'
-+gem 'validates_hostname', '~> 1.0', '>= 1.0.11'
++gem 'validates_hostname', '~> 1.0'
 +gem 'rubyzip', '~> 2.0', '>= 2.3.2', require: 'zip'
  # GitLab Pages letsencrypt support
  gem 'acme-client', '~> 2.0'
@@ -147,8 +146,8 @@ gitlab Gemfile
  gem 'graphql-docs', '~> 2.1.0', group: [:development, :test]
  gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
  
-@@ -137,23 +137,23 @@
- gem 'kaminari', '~> 1.0'
+@@ -135,23 +135,23 @@
+ gem 'kaminari', '~> 1.2.2'
  
  # HAML
 -gem 'hamlit', '~> 2.15.0'
@@ -160,22 +159,22 @@ gitlab Gemfile
 +gem 'mini_magick', '~> 4.10','>= 4.10.1'
  
  # for backups
- gem 'fog-aws', '~> 3.14'
+ gem 'fog-aws', '~> 3.15'
  # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
  # Also see config/initializers/fog_core_patch.rb.
 -gem 'fog-core', '= 2.1.0'
 +gem 'fog-core', '= 2.1'
- gem 'fog-google', '~> 1.15', require: 'fog/google'
- gem 'fog-local', '~> 0.6'
+ gem 'fog-google', '~> 1.19', require: 'fog/google'
+ gem 'fog-local', '~> 0.8'
  gem 'fog-openstack', '~> 1.0'
  gem 'fog-rackspace', '~> 0.1.1'
  gem 'fog-aliyun', '~> 0.3'
--gem 'gitlab-fog-azure-rm', '~> 1.3.0', require: 'fog/azurerm'
-+gem 'gitlab-fog-azure-rm', '~> 1.3', require: 'fog/azurerm'
+-gem 'gitlab-fog-azure-rm', '~> 1.4.0', require: 'fog/azurerm'
++gem 'gitlab-fog-azure-rm', '~> 1.4', require: 'fog/azurerm'
  
  # for Google storage
  gem 'google-api-client', '~> 0.33'
-@@ -162,38 +162,38 @@
+@@ -160,37 +160,37 @@
  gem 'unf', '~> 0.1.4'
  
  # Seed data
@@ -186,25 +185,23 @@ gitlab Gemfile
  gem 'elasticsearch-model', '~> 7.2'
  gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation'
 -gem 'elasticsearch-api',   '7.13.3'
--gem 'aws-sdk-core', '~> 3.159.0'
+-gem 'aws-sdk-core', '~> 3.167.0'
 +gem 'elasticsearch-api',   '~> 7.13', '>= 7.13.3'
-+gem 'aws-sdk-core', '~> 3.159'
++gem 'aws-sdk-core', '~> 3.167'
  gem 'aws-sdk-cloudformation', '~> 1'
--gem 'aws-sdk-s3', '~> 1.114.0'
-+gem 'aws-sdk-s3', '~> 1.114'
+-gem 'aws-sdk-s3', '~> 1.117.1'
++gem 'aws-sdk-s3', '~> 1.117'
  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'
--gem 'deckar01-task_list', '2.3.1'
--gem 'gitlab-markup', '~> 1.8.0'
--gem 'github-markup', '~> 1.7.0', require: 'github/markup'
-+gem 'html-pipeline', '~> 2.13','>= 2.13.2'
-+gem 'deckar01-task_list', '~> 2.3','>= 2.3.1'
-+gem 'gitlab-markup', '~> 1.8'
-+gem 'github-markup', '~> 1.7', require: 'github/markup'
+-gem 'html-pipeline', '~> 2.14.3'
+-gem 'deckar01-task_list', '2.3.2'
+-gem 'gitlab-markup', '~> 1.8.0', require: 'github/markup'
++gem 'html-pipeline', '~> 2.14','>= 2.14.3'
++gem 'deckar01-task_list', '~> 2.3','>= 2.3.2'
++gem 'gitlab-markup', '~> 1.8', require: 'github/markup'
  gem 'commonmarker', '~> 0.23.6'
 -gem 'kramdown', '~> 2.3.1'
 -gem 'RedCloth', '~> 4.3.2'
@@ -217,21 +214,21 @@ gitlab Gemfile
 -gem 'wikicloth', '0.8.1'
 -gem 'asciidoctor', '~> 2.0.17'
 +gem 'wikicloth', '~> 0.8.1'
-+gem 'asciidoctor', '~> 2.0', '>= 2.0.17'
++gem 'asciidoctor', '~> 2.0',  '>= 2.0.17'
  gem 'asciidoctor-include-ext', '~> 0.4.0', require: false
  gem 'asciidoctor-plantuml', '~> 0.0.16'
- gem 'asciidoctor-kroki', '~> 0.5.0', require: false
+ gem 'asciidoctor-kroki', '~> 0.7.0', require: false
 -gem 'rouge', '~> 3.30.0'
 +gem 'rouge', '~> 3.30'
  gem 'truncato', '~> 0.7.12'
 -gem 'bootstrap_form', '~> 4.2.0'
--gem 'nokogiri', '~> 1.13.8'
+-gem 'nokogiri', '~> 1.13.9'
 +gem 'bootstrap_form', '~> 4.2'
-+gem 'nokogiri', '~> 1.3', '>= 1.13.8'
++gem 'nokogiri', '~> 1.3','>= 1.13.9'
  
  # Calendar rendering
  gem 'icalendar'
-@@ -203,12 +203,12 @@
+@@ -200,12 +200,12 @@
  gem 'diff_match_patch', '~> 0.1.0'
  
  # Application server
@@ -246,25 +243,25 @@ gitlab Gemfile
    gem 'puma_worker_killer', '~> 0.3.1', require: false
    gem 'sd_notify', '~> 0.1.0', require: false
  end
-@@ -220,13 +220,13 @@
+@@ -217,13 +217,13 @@
  gem 'acts-as-taggable-on', '~> 9.0'
  
  # Background jobs
--gem 'sidekiq', '~> 6.4.0'
+-gem 'sidekiq', '~> 6.5.7'
 -gem 'sidekiq-cron', '~> 1.8.0'
 -gem 'redis-namespace', '~> 1.9.0'
-+gem 'sidekiq', '~> 6.4'
++gem 'sidekiq', '~> 6.5'
 +gem 'sidekiq-cron', '~> 1.8'
 +gem 'redis-namespace', '~> 1.9'
- gem 'gitlab-sidekiq-fetcher', '0.8.0', require: 'sidekiq-reliable-fetch'
+ gem 'gitlab-sidekiq-fetcher', '0.9.0', require: 'sidekiq-reliable-fetch'
  
  # Cron Parser
 -gem 'fugit', '~> 1.2.1'
-+gem 'fugit', '~> 1.2','>= 1.2.1'
++gem 'fugit',  '~> 1.2','>= 1.2.1'
  
  # HTTP requests
- gem 'httparty', '~> 0.16.4'
-@@ -238,14 +238,14 @@
+ gem 'httparty', '~> 0.20.0'
+@@ -235,14 +235,14 @@
  gem 'ruby-progressbar', '~> 1.10'
  
  # GitLab settings
@@ -272,22 +269,22 @@ gitlab Gemfile
 +gem 'settingslogic', '~> 2.0', '>= 2.0.9'
  
  # Linear-time regex library for untrusted regular expressions
--gem 're2', '~> 1.5.0'
-+gem 're2', '~> 1.5'
+-gem 're2', '~> 1.6.0'
++gem 're2', '~> 1.6'
  
  # Misc
  
 -gem 'version_sorter', '~> 2.2.4'
-+gem 'version_sorter', '~> 2.2', '>= 2.2.4'
++gem 'version_sorter',  '~> 2.2', '>= 2.2.4'
  
  # Export Ruby Regex to Javascript
- gem 'js_regex', '~> 3.7'
-@@ -254,24 +254,24 @@
+ gem 'js_regex', '~> 3.8'
+@@ -251,24 +251,24 @@
  gem 'device_detector'
  
  # Redis
--gem 'redis', '~> 4.7.0'
-+gem 'redis', '~> 4.7'
+-gem 'redis', '~> 4.8.0'
++gem 'redis', '~> 4.8'
  gem 'connection_pool', '~> 2.0'
  
  # Redis session store
@@ -299,7 +296,7 @@ gitlab Gemfile
  
  # Jira integration
 -gem 'jira-ruby', '~> 2.1.4'
-+gem 'jira-ruby', '~> 2.1', '>= 2.1.4'
++gem 'jira-ruby',  '~> 2.1', '>= 2.1.4'
  gem 'atlassian-jwt', '~> 0.2.0'
  
  # Flowdock integration
@@ -311,8 +308,8 @@ gitlab Gemfile
  
  # Hangouts Chat integration
  gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
-@@ -283,14 +283,14 @@
- gem 'ruby-fogbugz', '~> 0.2.1'
+@@ -280,14 +280,14 @@
+ gem 'ruby-fogbugz', '~> 0.3.0'
  
  # Kubernetes integration
 -gem 'kubeclient', '~> 4.9.3'
@@ -329,7 +326,7 @@ gitlab Gemfile
  
  # Working with license
  # Detects the open source license the repository includes
-@@ -312,32 +312,32 @@
+@@ -309,32 +309,32 @@
  
  gem 'rack-proxy', '~> 0.7.4'
  
@@ -344,7 +341,7 @@ gitlab Gemfile
  gem 'tanuki_emoji', '~> 0.6'
 -gem 'gon', '~> 6.4.0'
 +gem 'gon', '~> 6.4'
- gem 'request_store', '~> 1.5'
+ gem 'request_store', '~> 1.5.1'
  gem 'base32', '~> 0.3.0'
  
 -gem 'gitlab-license', '~> 2.2.1'
@@ -365,15 +362,14 @@ gitlab Gemfile
  
  # PostgreSQL query parsing
  #
--gem 'pg_query', '~> 2.1.4'
-+gem 'pg_query', '~> 2.1', '>= 2.1.4'
+ gem 'pg_query', '~> 2.2'
  
 -gem 'premailer-rails', '~> 1.10.3'
 +gem 'premailer-rails', '~> 1.10','>=  1.10.3'
  
- # LabKit: Tracing and Correlation
- gem 'gitlab-labkit', '~> 0.24.0'
-@@ -346,11 +346,11 @@
+ gem 'gitlab-labkit', '~> 0.29.0'
+ gem 'thrift', '>= 0.16.0'
+@@ -342,11 +342,11 @@
  # I18n
  gem 'ruby_parser', '~> 3.15', require: false
  gem 'rails-i18n', '~> 7.0'
@@ -387,7 +383,7 @@ gitlab Gemfile
  
  # Perf bar
  gem 'peek', '~> 1.1'
-@@ -359,10 +359,10 @@
+@@ -355,10 +355,10 @@
  gem 'snowplow-tracker', '~> 0.6.1'
  
  # Metrics
@@ -399,8 +395,8 @@ gitlab Gemfile
 +gem 'warning', '~> 1.3'
  
  group :development do
-   gem 'lefthook', '~> 1.1.3', require: false
-@@ -444,24 +444,24 @@
+   gem 'lefthook', '~> 1.2.0', require: false
+@@ -440,24 +440,24 @@
  end
  
  group :test do
@@ -436,7 +432,7 @@ gitlab Gemfile
    gem 'rspec_junit_formatter'
    gem 'guard-rspec'
  
-@@ -490,8 +490,8 @@
+@@ -486,8 +486,8 @@
  gem 'health_check', '~> 3.0'
  
  # System information
@@ -447,7 +443,7 @@ gitlab Gemfile
  
  # NTP client
  gem 'net-ntp'
-@@ -500,15 +500,15 @@
+@@ -496,15 +496,15 @@
  gem 'ssh_data', '~> 1.3'
  
  # Spamcheck GRPC protocol definitions
@@ -464,9 +460,9 @@ gitlab Gemfile
 -gem 'grpc', '~> 1.42.0'
 +gem 'grpc', '~> 1.42'
  
- gem 'google-protobuf', '~> 3.21'
+ gem 'google-protobuf', '~> 3.21', '>= 3.21.9'
  
-@@ -518,7 +518,7 @@
+@@ -514,7 +514,7 @@
  gem 'flipper', '~> 0.25.0'
  gem 'flipper-active_record', '~> 0.25.0'
  gem 'flipper-active_support_cache_store', '~> 0.25.0'
@@ -475,7 +471,7 @@ gitlab Gemfile
  gem 'gitlab-experiment', '~> 0.7.1'
  
  # Structured logging
-@@ -551,12 +551,11 @@
+@@ -547,12 +547,12 @@
  gem 'valid_email', '~> 0.1'
  
  # JSON
@@ -483,16 +479,16 @@ gitlab Gemfile
 +gem 'json', '~> 2.5', '>= 2.5.1'
  gem 'json_schemer', '~> 0.2.18'
 -gem 'oj', '~> 3.13.21'
++gem 'oj', '~> 3.13', '>= 3.13.21'
+ gem 'oj-introspect', '~> 0.7'
 -gem 'multi_json', '~> 1.14.1'
 -gem 'yajl-ruby', '~> 1.4.3', require: 'yajl'
--
-+gem 'oj', '~> 3.13', '>= 3.13.20'
-+gem 'multi_json', '~> 1.14', '>= 1.14.1'
++gem 'multi_json',  '~> 1.14', '>= 1.14.1'
 +gem 'yajl-ruby', '~> 1.4','>= 1.4.3', require: 'yajl'
+ 
  gem 'webauthn', '~> 2.3'
  
- # IPAddress utilities
-@@ -566,14 +565,14 @@
+@@ -563,14 +563,14 @@
  
  gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff'
  
diff --git a/debian/patches/Gemfile/0020-remove-development-test.patch b/debian/patches/Gemfile/0020-remove-development-test.patch
index f1845178c7..28e0f365c9 100644
--- a/debian/patches/Gemfile/0020-remove-development-test.patch
+++ b/debian/patches/Gemfile/0020-remove-development-test.patch
@@ -16,8 +16,8 @@ Bundler will fail when it can't find these locally
 -gem 'graphql-docs', '~> 2.1.0', group: [:development, :test]
  gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
  
- gem 'hashie'
-@@ -348,7 +345,6 @@
+ gem 'hashie', '~> 5.0.0'
+@@ -344,7 +341,6 @@
  gem 'rails-i18n', '~> 7.0'
  gem 'gettext_i18n_rails', '~> 1.8'
  gem 'gettext_i18n_rails_js', '~> 1.3'
@@ -25,17 +25,17 @@ Bundler will fail when it can't find these locally
  
  gem 'batch-loader', '~> 2.0', '>= 2.0.1'
  
-@@ -364,85 +360,6 @@
+@@ -360,85 +356,6 @@
  
  gem 'warning', '~> 1.3'
  
 -group :development do
--  gem 'lefthook', '~> 1.1.3', require: false
+-  gem 'lefthook', '~> 1.2.0', require: false
 -  gem 'rubocop'
 -  gem 'solargraph', '~> 0.47.2', require: false
 -
 -  gem 'letter_opener_web', '~> 2.0.0'
--  gem 'lookbook', '~> 1.0', '>= 1.0.8'
+-  gem 'lookbook', '~> 1.2', '>= 1.2.1'
 -
 -  # Better errors handler
 -  gem 'better_errors', '~> 2.9.1'
@@ -93,7 +93,7 @@ Bundler will fail when it can't find these locally
 -end
 -
 -group :development, :test, :danger do
--  gem 'gitlab-dangerfiles', '~> 3.5.2', require: false
+-  gem 'gitlab-dangerfiles', '~> 3.6.2', require: false
 -end
 -
 -group :development, :test, :coverage do
diff --git a/debian/patches/Gemfile/0030-make-test-dependencies-conditional.patch b/debian/patches/Gemfile/0030-make-test-dependencies-conditional.patch
index 0fcdb716eb..407c02eb7c 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
-@@ -360,7 +360,7 @@
+@@ -356,7 +356,7 @@
  
  gem 'warning', '~> 1.3'
  
diff --git a/debian/patches/Gemfile/0040-relax-httparty.patch b/debian/patches/Gemfile/0040-relax-httparty.patch
index 6a33000a88..33ae19d440 100644
--- a/debian/patches/Gemfile/0040-relax-httparty.patch
+++ b/debian/patches/Gemfile/0040-relax-httparty.patch
@@ -2,12 +2,12 @@ Allow newer versions of httparty to satisfy dependency
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -226,7 +226,7 @@
- gem 'fugit', '~> 1.2','>= 1.2.1'
+@@ -223,7 +223,7 @@
+ gem 'fugit',  '~> 1.2','>= 1.2.1'
  
  # HTTP requests
--gem 'httparty', '~> 0.16.4'
-+gem 'httparty', '~> 0.16'
+-gem 'httparty', '~> 0.20.0'
++gem 'httparty', '~> 0.20'
  
  # Colored output to console
  gem 'rainbow', '~> 3.0'
diff --git a/debian/patches/Gemfile/0050-relax-rdoc.patch b/debian/patches/Gemfile/0050-relax-rdoc.patch
index d7940c41a7..bbcb4d82b7 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
-@@ -179,7 +179,7 @@
+@@ -176,7 +176,7 @@
  gem 'commonmarker', '~> 0.23.6'
  gem 'kramdown', '~> 2.3','>= 2.3.1'
  gem 'RedCloth', '~> 4.3','>= 4.3.2'
diff --git a/debian/patches/Gemfile/0090-remove-ee-only-gems.patch b/debian/patches/Gemfile/0090-remove-ee-only-gems.patch
index 438d018ea1..c23acf8f29 100644
--- a/debian/patches/Gemfile/0090-remove-ee-only-gems.patch
+++ b/debian/patches/Gemfile/0090-remove-ee-only-gems.patch
@@ -10,8 +10,8 @@ This gem is used only in gitlab Enterprise Edition
  gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos
  
  # Spam and anti-bot protection
-@@ -319,8 +318,6 @@
- gem 'request_store', '~> 1.5'
+@@ -316,8 +315,6 @@
+ gem 'request_store', '~> 1.5.1'
  gem 'base32', '~> 0.3.0'
  
 -gem 'gitlab-license', '~> 2.2','>= 2.2.1'
diff --git a/debian/patches/Gemfile/0120-relax-capybara.patch b/debian/patches/Gemfile/0120-relax-capybara.patch
index 8164b1f7a2..44795bc740 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
-@@ -364,7 +364,7 @@
+@@ -360,7 +360,7 @@
    gem 'rspec-benchmark', '~> 0.6.0'
    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 369c3494d4..3e3124f0db 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
-@@ -365,7 +365,6 @@
+@@ -361,7 +361,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 b82ead7f44..549c59cd3e 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
-@@ -376,7 +376,6 @@
+@@ -372,7 +372,6 @@
    gem 'concurrent-ruby', '~> 1.1'
    gem 'test-prof', '~> 1.0', '>= 1.0.7'
    gem 'rspec_junit_formatter'
diff --git a/debian/patches/Gemfile/0190-relax-rdoc.patch b/debian/patches/Gemfile/0190-relax-rdoc.patch
index 1004cf9a38..e78286b815 100644
--- a/debian/patches/Gemfile/0190-relax-rdoc.patch
+++ b/debian/patches/Gemfile/0190-relax-rdoc.patch
@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -181,7 +181,7 @@
+@@ -178,7 +178,7 @@
  gem 'commonmarker', '~> 0.23.6'
  gem 'kramdown', '~> 2.3','>= 2.3.1'
  gem 'RedCloth', '~> 4.3','>= 4.3.2'
diff --git a/debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch b/debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch
index d4d3d085fc..de615f153e 100644
--- a/debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch
+++ b/debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch
@@ -2,10 +2,12 @@ Rakefile need this gem
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -494,3 +494,6 @@
- 
+@@ -493,5 +493,8 @@
  # Apple plist parsing
  gem 'CFPropertyList'
-+
+ 
 +# This is required for Rakefile
 +gem 'gitlab-dangerfiles'
++
+ # For phone verification
+ gem 'telesignenterprise', '~> 2.2'
diff --git a/debian/patches/Gemfile/0220-relax-gitlab-labkit.patch b/debian/patches/Gemfile/0220-relax-gitlab-labkit.patch
index 169af88f07..c446e95038 100644
--- a/debian/patches/Gemfile/0220-relax-gitlab-labkit.patch
+++ b/debian/patches/Gemfile/0220-relax-gitlab-labkit.patch
@@ -1,10 +1,10 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -337,7 +337,7 @@
+@@ -333,7 +333,7 @@
+ 
  gem 'premailer-rails', '~> 1.10','>=  1.10.3'
  
- # LabKit: Tracing and Correlation
--gem 'gitlab-labkit', '~> 0.24.0'
+-gem 'gitlab-labkit', '~> 0.29.0'
 +gem 'gitlab-labkit', '~> 0.25.0'
  gem 'thrift', '>= 0.16.0'
  
diff --git a/debian/patches/nodejs/0020-remove-dev-dependencies.patch b/debian/patches/nodejs/0020-remove-dev-dependencies.patch
index c0c1ff474f..7a79dbb4c3 100644
--- a/debian/patches/nodejs/0020-remove-dev-dependencies.patch
+++ b/debian/patches/nodejs/0020-remove-dev-dependencies.patch
@@ -2,7 +2,7 @@ These are not required in production
 
 --- a/package.json
 +++ b/package.json
-@@ -203,60 +203,7 @@
+@@ -205,59 +205,6 @@
      "yaml": "^2.0.0-10"
    },
    "devDependencies": {
@@ -21,7 +21,7 @@ These are not required in production
 -    "cheerio": "^1.0.0-rc.9",
 -    "commander": "^2.20.3",
 -    "custom-jquery-matchers": "^2.1.0",
--    "eslint": "8.25.0",
+-    "eslint": "8.26.0",
 -    "eslint-import-resolver-jest": "3.0.2",
 -    "eslint-import-resolver-webpack": "0.13.2",
 -    "eslint-plugin-import": "^2.26.0",
@@ -39,7 +39,6 @@ These are not required in production
 -    "jest-environment-jsdom": "^27.5.1",
 -    "jest-jasmine2": "^27.5.1",
 -    "jest-junit": "^12.0.0",
--    "jest-raw-loader": "^1.0.1",
 -    "jest-util": "^27.5.1",
 -    "jsonlint": "^1.6.3",
 -    "markdownlint-cli": "0.32.2",
@@ -54,17 +53,16 @@ These are not required in production
 -    "purgecss-from-html": "^4.0.3",
 -    "sass": "^1.49.9",
 -    "stylelint": "^14.9.1",
+-    "swagger-cli": "^4.0.4",
 -    "timezone-mock": "^1.0.8",
 -    "webpack-dev-server": "4.11.1",
 -    "xhr-mock": "^2.5.1",
 -    "yarn-check-webpack-plugin": "^1.2.0",
 -    "yarn-deduplicate": "^6.0.0"
--  },
-+     },
+   },
    "blockedDependencies": {
      "bootstrap-vue": "https://docs.gitlab.com/ee/development/fe_guide/dependencies.html#bootstrapvue"
-   },
-@@ -268,4 +215,4 @@
+@@ -270,4 +217,4 @@
      "node": ">=12.22.1",
      "yarn": "^1.10.0"
    }
diff --git a/debian/patches/nodejs/0040-use-packaged-modules.patch b/debian/patches/nodejs/0040-use-packaged-modules.patch
index f39ebecb3c..63ac9b9c95 100644
--- a/debian/patches/nodejs/0040-use-packaged-modules.patch
+++ b/debian/patches/nodejs/0040-use-packaged-modules.patch
@@ -83,7 +83,7 @@ Use debian packaged node modules when available
    components: { Page },
 --- a/package.json
 +++ b/package.json
-@@ -47,8 +47,8 @@
+@@ -48,8 +48,8 @@
    "dependencies": {
      "@_ueberdosis/prosemirror-tables": "^1.1.3",
      "@apollo/client": "^3.5.10",
@@ -94,12 +94,12 @@ Use debian packaged node modules when available
      "@codesandbox/sandpack-client": "^1.2.2",
      "@gitlab/at.js": "1.5.7",
      "@gitlab/favicon-overlay": "2.0.0",
-@@ -56,7 +56,7 @@
-     "@gitlab/ui": "46.1.0",
+@@ -57,7 +57,7 @@
+     "@gitlab/ui": "49.10.0",
      "@gitlab/visual-review-tools": "1.7.3",
-     "@gitlab/web-ide": "0.0.1-dev-20220815034418",
+     "@gitlab/web-ide": "0.0.1-dev-20221114183058",
 -    "@rails/actioncable": "6.1.4-7",
 +    "@rails/actioncable": "link:/usr/share/nodejs/@rails/actioncable",
      "@rails/ujs": "6.1.4-7",
      "@sentry/browser": "5.30.0",
-     "@sourcegraph/code-host-integration": "0.0.60",
+     "@sourcegraph/code-host-integration": "0.0.84",
diff --git a/debian/patches/nodejs/0050-add-babel-plugins.patch b/debian/patches/nodejs/0050-add-babel-plugins.patch
index bec2181df3..12231a9e77 100644
--- a/debian/patches/nodejs/0050-add-babel-plugins.patch
+++ b/debian/patches/nodejs/0050-add-babel-plugins.patch
@@ -1,6 +1,6 @@
 --- a/package.json
 +++ b/package.json
-@@ -48,6 +48,10 @@
+@@ -49,6 +49,10 @@
      "@_ueberdosis/prosemirror-tables": "^1.1.3",
      "@apollo/client": "^3.5.10",
      "@babel/core": "link:/usr/share/nodejs/@babel/core",
diff --git a/debian/patches/nodejs/0060-use-system-yaml.patch b/debian/patches/nodejs/0060-use-system-yaml.patch
index 32d2863c1f..68db385bb8 100644
--- a/debian/patches/nodejs/0060-use-system-yaml.patch
+++ b/debian/patches/nodejs/0060-use-system-yaml.patch
@@ -2,7 +2,7 @@ yaml from npm registry needs a newer nodejs than what is in bullseye
 
 --- a/package.json
 +++ b/package.json
-@@ -204,7 +204,7 @@
+@@ -206,7 +206,7 @@
      "webpack-stats-plugin": "^0.3.1",
      "worker-loader": "^2.0.0",
      "xterm": "3.14.5",
@@ -10,4 +10,4 @@ yaml from npm registry needs a newer nodejs than what is in bullseye
 +    "yaml": "link:/usr/share/nodejs/yaml"
    },
    "devDependencies": {
-      },
+   },
diff --git a/debian/patches/nodejs/0070-use-system-katex.patch b/debian/patches/nodejs/0070-use-system-katex.patch
index 72535ff364..db010015c5 100644
--- a/debian/patches/nodejs/0070-use-system-katex.patch
+++ b/debian/patches/nodejs/0070-use-system-katex.patch
@@ -1,6 +1,6 @@
 --- a/package.json
 +++ b/package.json
-@@ -141,7 +141,7 @@
+@@ -143,7 +143,7 @@
      "js-cookie": "^3.0.0",
      "js-yaml": "^3.13.1",
      "jszip": "^3.1.3",