Refresh patches

debian/patches/Gemfile/0010-relax-stable-libs.patch

@@ -15,7 +15,7 @@ gitlab Gemfile
  
  # Pin openssl to match the version bundled with our supported Rubies.
  # See https://stdgems.org/openssl/#gem-version.
-@@ -29,46 +29,46 @@
+@@ -29,43 +29,43 @@
  # Responders respond_to and respond_with
  gem 'responders', '~> 3.0'
  
@@ -23,11 +23,7 @@ gitlab Gemfile
 +gem 'sprockets', '~> 3.7'
  
 -gem 'view_component', '~> 2.74.1'
-+gem 'view_component', '~> 2.74', '>=2.74.1'
++gem 'view_component', '~> 2.74', '>= 2.74.1'
- 
- # Default values for AR models
--gem 'default_value_for', '~> 3.4.0'
-+gem 'default_value_for', '~> 3.4'
  
  # Supported DBs
 -gem 'pg', '~> 1.4.5'
@@ -67,7 +63,7 @@ gitlab Gemfile
 -gem 'omniauth-alicloud', '~> 2.0.1'
 -gem 'omniauth-facebook', '~> 4.0.0'
 -gem 'omniauth-github', '2.0.1'
-+gem 'omniauth-alicloud', '~> 2.0'
++gem 'omniauth-alicloud', '~> 2.0', '>= 2.0.1'
 +gem 'omniauth-facebook', '~> 4.0'
 +gem 'omniauth-github', '~> 2.0', '>= 2.0.1'
  gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md
@@ -78,7 +74,7 @@ gitlab Gemfile
  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_openid_connect', '~> 0.6.1'
-@@ -77,8 +77,8 @@
+@@ -74,8 +74,8 @@
  gem 'openid_connect', '= 1.3.0'
  gem 'omniauth-salesforce', '~> 1.0.5', path: 'vendor/gems/omniauth-salesforce' # See gem README.md
  gem 'omniauth-atlassian-oauth2', '~> 0.2.0'
@@ -89,7 +85,7 @@ gitlab Gemfile
  
  # Kerberos authentication. EE-only
  gem 'gssapi', '~> 1.3.1', group: :kerberos
-@@ -87,28 +87,28 @@
+@@ -84,28 +84,28 @@
  # Spam and anti-bot protection
  gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails'
  gem 'akismet', '~> 3.0'
@@ -124,7 +120,7 @@ gitlab Gemfile
  
  # LDAP Auth
  # GitLab fork with several improvements to original library. For full list of changes
-@@ -117,30 +117,30 @@
+@@ -114,30 +114,30 @@
  gem 'net-ldap', '~> 0.17.1'
  
  # API
@@ -162,8 +158,8 @@ gitlab Gemfile
 +gem 'mini_magick', '~> 4.10','>= 4.10.1'
  
  # for backups
- gem 'fog-aws', '~> 3.15'
+ gem 'fog-aws', '~> 3.18'
-@@ -158,7 +158,7 @@
+@@ -153,7 +153,7 @@
  # We may want to update this dependency if this is ever addressed upstream, e.g. via
  # https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93
  gem 'fog-aliyun', '~> 0.4'
@@ -172,7 +168,7 @@ gitlab Gemfile
  
  # for Google storage
  gem 'google-cloud-storage', '~> 1.44.0'
-@@ -176,36 +176,36 @@
+@@ -171,36 +171,36 @@
  gem 'unf', '~> 0.1.4'
  
  # Seed data
@@ -183,9 +179,9 @@ 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.170.0'
+-gem 'aws-sdk-core', '~> 3.170.1'
 +gem 'elasticsearch-api',   '~> 7.13', '>= 7.13.3'
-+gem 'aws-sdk-core', '~> 3.170', '>= 3.170.0'
++gem 'aws-sdk-core', '~> 3.170', '>= 3.170.1'
  gem 'aws-sdk-cloudformation', '~> 1'
 -gem 'aws-sdk-s3', '~> 1.119.1'
 +gem 'aws-sdk-s3', '~> 1.119', '>= 1.119.1'
@@ -197,7 +193,7 @@ gitlab Gemfile
 -gem 'html-pipeline', '~> 2.14.3'
 -gem 'deckar01-task_list', '2.3.2'
 -gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup'
-+gem 'html-pipeline', '~> 2.14', '>=2.14.3'
++gem 'html-pipeline', '~> 2.14', '>= 2.14.3'
 +gem 'deckar01-task_list', '~> 2.3', '>= 2.3.2'
 +gem 'gitlab-markup', '~> 1.9', require: 'github/markup'
  gem 'commonmarker', '~> 0.23.6'
@@ -209,21 +205,22 @@ gitlab Gemfile
 +gem 'rdoc', '~> 6.3', '>= 6.3.2'
  gem 'org-ruby', '~> 0.9.12'
  gem 'creole', '~> 0.5.0'
- gem 'wikicloth', '0.8.1'
+-gem 'wikicloth', '0.8.1'
--gem 'asciidoctor', '~> 2.0.17'
+-gem 'asciidoctor', '~> 2.0.18'
++gem 'wikicloth', '~> 0.8.1'
 +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.7.0', require: false
+ gem 'asciidoctor-kroki', '~> 0.8.0', require: false
--gem 'rouge', '~> 3.30.0'
+-gem 'rouge', '~> 4.1.0'
-+gem 'rouge', '~> 3.30'
++gem 'rouge', '~> 4.1'
  gem 'truncato', '~> 0.7.12'
--gem 'nokogiri', '~> 1.14.1'
+-gem 'nokogiri', '~> 1.14.2'
-+gem 'nokogiri', '~> 1.14', '>= 1.14.1'
++gem 'nokogiri', '~> 1.14', '>= 1.14.2'
  
  # Calendar rendering
  gem 'icalendar'
-@@ -215,12 +215,12 @@
+@@ -210,12 +210,12 @@
  gem 'diff_match_patch', '~> 0.1.0'
  
  # Application server
@@ -238,7 +235,7 @@ gitlab Gemfile
    gem 'puma_worker_killer', '~> 0.3.1', require: false
    gem 'sd_notify', '~> 0.1.0', require: false
  end
-@@ -232,13 +232,13 @@
+@@ -227,13 +227,13 @@
  gem 'acts-as-taggable-on', '~> 9.0'
  
  # Background jobs
@@ -256,7 +253,7 @@ gitlab Gemfile
  
  # HTTP requests
  gem 'httparty', '~> 0.20.0'
-@@ -250,10 +250,10 @@
+@@ -245,10 +245,10 @@
  gem 'ruby-progressbar', '~> 1.10'
  
  # GitLab settings
@@ -269,7 +266,7 @@ gitlab Gemfile
  
  # Misc
  
-@@ -266,21 +266,21 @@
+@@ -261,21 +261,21 @@
  gem 'device_detector'
  
  # Redis
@@ -295,7 +292,7 @@ gitlab Gemfile
  
  # Hangouts Chat integration
  gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat'
-@@ -296,10 +296,10 @@
+@@ -291,10 +291,10 @@
  
  # Sanitize user input
  gem 'sanitize', '~> 6.0'
@@ -308,7 +305,7 @@ gitlab Gemfile
  
  # Working with license
  # Detects the open source license the repository includes
-@@ -321,32 +321,32 @@
+@@ -316,32 +316,32 @@
  
  gem 'rack-proxy', '~> 0.7.6'
  
@@ -350,9 +347,9 @@ gitlab Gemfile
 -gem 'premailer-rails', '~> 1.10.3'
 +gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
  
- gem 'gitlab-labkit', '~> 0.30.1'
+ gem 'gitlab-labkit', '~> 0.31.1'
  gem 'thrift', '>= 0.16.0'
-@@ -354,11 +354,11 @@
+@@ -349,11 +349,11 @@
  # I18n
  gem 'ruby_parser', '~> 3.19', require: false
  gem 'rails-i18n', '~> 7.0'
@@ -366,20 +363,20 @@ gitlab Gemfile
  
  # Perf bar
  gem 'peek', '~> 1.1'
-@@ -367,10 +367,10 @@
+@@ -365,10 +365,10 @@
  gem 'snowplow-tracker', '~> 0.8.0'
  
  # Metrics
 -gem 'webrick', '~> 1.6.1', require: false
 +gem 'webrick', '~> 1.6', '>= 1.6.1', require: false
- gem 'prometheus-client-mmap', '~> 0.17', require: 'prometheus/client'
+ gem 'prometheus-client-mmap', '~> 0.19', require: 'prometheus/client'
  
 -gem 'warning', '~> 1.3.0'
 +gem 'warning', '~> 1.3'
  
  group :development do
-   gem 'lefthook', '~> 1.2.9', require: false
+   gem 'lefthook', '~> 1.3.3', require: false
-@@ -452,24 +452,24 @@
+@@ -450,24 +450,24 @@
  end
  
  group :test do
@@ -388,23 +385,20 @@ gitlab Gemfile
    gem 'rspec-retry', '~> 0.6.1'
    gem 'rspec_profiling', '~> 0.0.6'
    gem 'rspec-benchmark', '~> 0.6.0'
-   gem 'rspec-parameterized', require: false
+   gem 'rspec-parameterized', '~> 1.0', require: false
  
 -  gem 'capybara', '~> 3.35.3'
 -  gem 'capybara-screenshot', '~> 1.0.22'
--  gem 'selenium-webdriver', '~> 3.142'
++  gem 'capybara', '~> 3.35', '~> 3.35.3'
--
++  gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
+   gem 'selenium-webdriver', '~> 3.142'
+ 
 -  gem 'graphlyte', '~> 1.0.0'
--
++  gem 'graphlyte', '~> 1.0'
+ 
 -  gem 'shoulda-matchers', '~> 5.1.0', require: false
 -  gem 'email_spec', '~> 2.2.0'
 -  gem 'webmock', '~> 3.9.1'
-+  gem 'capybara', '~> 3.35', '~> 3.35.3'
-+  gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
-+  gem 'selenium-webdriver', '~> 3.1','>= 3.142'
-+
-+  gem 'graphlyte', '~> 1.0'
-+
 +  gem 'shoulda-matchers', '~> 5.1', require: false
 +  gem 'email_spec', '~> 2.2'
 +  gem 'webmock', '~> 3.9', '>= 3.9.1'
@@ -414,8 +408,8 @@ gitlab Gemfile
 +  gem 'test-prof', '~> 1.0', '>= 1.0.7'
    gem 'rspec_junit_formatter'
    gem 'guard-rspec'
- 
+   gem 'axe-core-rspec'
-@@ -498,8 +498,8 @@
+@@ -497,8 +497,8 @@
  gem 'health_check', '~> 3.0'
  
  # System information
@@ -426,7 +420,7 @@ gitlab Gemfile
  
  # NTP client
  gem 'net-ntp'
-@@ -508,25 +508,25 @@
+@@ -507,25 +507,25 @@
  gem 'ssh_data', '~> 1.3'
  
  # Spamcheck GRPC protocol definitions
@@ -443,7 +437,7 @@ gitlab Gemfile
 -gem 'grpc', '~> 1.42.0'
 +gem 'grpc', '~> 1.42'
  
- gem 'google-protobuf', '~> 3.21', '>= 3.21.12'
+ gem 'google-protobuf', '~> 3.22', '>= 3.22.2'
  
 -gem 'toml-rb', '~> 2.2.0'
 +gem 'toml-rb', '~> 2.2'
@@ -457,7 +451,7 @@ gitlab Gemfile
  gem 'gitlab-experiment', '~> 0.7.1'
  
  # Structured logging
-@@ -537,9 +537,9 @@
+@@ -536,9 +536,9 @@
  gem 'gitlab-net-dns', '~> 0.9.1'
  
  # Countries list
@@ -469,7 +463,7 @@ gitlab Gemfile
  
  # LRU cache
  gem 'lru_redux'
-@@ -553,18 +553,18 @@
+@@ -556,18 +556,18 @@
  gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer'
  
  # File encryption
@@ -491,9 +485,9 @@ gitlab Gemfile
 +gem 'multi_json', '~> 1.14', '>= 1.14.1'
 +gem 'yajl-ruby', '~> 1.4','>= 1.4.3', require: 'yajl'
  
- gem 'webauthn', '~> 2.3'
+ gem 'webauthn', '~> 3.0'
  
-@@ -575,14 +575,14 @@
+@@ -578,20 +578,20 @@
  
  gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff'
  
@@ -510,3 +504,10 @@ gitlab Gemfile
  
  # Work with RPM packages
  gem 'arr-pm', '~> 0.0.12'
+ 
+ # Apple plist parsing
+-gem 'CFPropertyList', '~> 3.0.0'
++gem 'CFPropertyList', '~> 3.0'
+ gem 'app_store_connect'
+ 
+ # For phone verification

debian/patches/Gemfile/0020-remove-development-test.patch

@@ -2,7 +2,7 @@ Bundler will fail when it can't find these locally
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -120,14 +120,12 @@ gem 'net-ldap', '~> 0.17.1'
+@@ -117,14 +117,12 @@
  gem 'grape', '~> 1.5','>= 1.5.2'
  gem 'grape-entity', '~> 0.10.0'
  gem 'rack-cors', '~> 1.1', '>= 1.1.1', require: 'rack/cors'
@@ -18,7 +18,7 @@ Bundler will fail when it can't find these locally
  gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import)
  
  gem 'hashie', '~> 5.0'
-@@ -356,7 +354,6 @@ gem 'ruby_parser', '~> 3.19', require: f
+@@ -351,7 +349,6 @@
  gem 'rails-i18n', '~> 7.0'
  gem 'gettext_i18n_rails', '~> 1.8'
  gem 'gettext_i18n_rails_js', '~> 1.3'
@@ -26,12 +26,12 @@ Bundler will fail when it can't find these locally
  
  gem 'batch-loader', '~> 2.0', '>= 2.0.1'
  
-@@ -372,84 +369,7 @@ gem 'prometheus-client-mmap', '~> 0.17',
+@@ -370,85 +367,6 @@
  
  gem 'warning', '~> 1.3'
  
 -group :development do
--  gem 'lefthook', '~> 1.2.9', require: false
+-  gem 'lefthook', '~> 1.3.3', require: false
 -  gem 'rubocop'
 -  gem 'solargraph', '~> 0.47.2', require: false
 -
@@ -72,9 +72,9 @@ Bundler will fail when it can't find these locally
 -
 -  gem 'haml_lint', '~> 0.40.0', require: false
 -  gem 'bundler-audit', '~> 0.7.0.1', require: false
- 
+-
 -  # Benchmarking & profiling
--  gem 'benchmark-ips', '~> 2.3.0', require: false
+-  gem 'benchmark-ips', '~> 2.11.0', require: false
 -  gem 'benchmark-memory', '~> 0.1', require: false
 -
 -  gem 'knapsack', '~> 1.21.1'
@@ -94,7 +94,7 @@ Bundler will fail when it can't find these locally
 -end
 -
 -group :development, :test, :danger do
--  gem 'gitlab-dangerfiles', '~> 3.7.0', require: false
+-  gem 'gitlab-dangerfiles', '~> 3.8.0', require: false
 -end
 -
 -group :development, :test, :coverage do
@@ -108,6 +108,7 @@ Bundler will fail when it can't find these locally
 -group :development, :test, :omnibus do
 -  gem 'license_finder', '~> 7.0', require: false
 -end
- 
+-
  group :test do
    gem 'fuubar', '~> 2.2'
+   gem 'rspec-retry', '~> 0.6.1'

debian/patches/Gemfile/0030-make-test-dependencies-conditional.patch

@@ -2,9 +2,9 @@ Make test dependencies conditional so we can enable them when running autopkgtes
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -371,7 +371,7 @@ gem 'warning', '~> 1.3'
+@@ -367,7 +367,7 @@
- 
  
+ gem 'warning', '~> 1.3'
  
 -group :test do
 +if ENV["INCLUDE_TEST_DEPENDS"] == "true"

debian/patches/Gemfile/0040-relax-httparty.patch

@@ -2,7 +2,7 @@ Allow newer versions of httparty to satisfy dependency
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -239,7 +239,7 @@ gem 'gitlab-sidekiq-fetcher', '0.9.0', r
+@@ -234,7 +234,7 @@
  gem 'fugit', '~> 1.8', '>= 1.8.1'
  
  # HTTP requests

debian/patches/Gemfile/0050-relax-rdoc.patch

@@ -2,7 +2,7 @@ Allow rdoc from ruby 2.5 to match requirement
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -193,7 +193,7 @@ gem 'gitlab-markup', '~> 1.9', require:
+@@ -188,7 +188,7 @@
  gem 'commonmarker', '~> 0.23.6'
  gem 'kramdown', '~> 2.3', '>=2.3.1'
  gem 'RedCloth', '~> 4.3', '>= 4.3.2'
@@ -10,4 +10,4 @@ Allow rdoc from ruby 2.5 to match requirement
 +gem 'rdoc', '~> 6.0'
  gem 'org-ruby', '~> 0.9.12'
  gem 'creole', '~> 0.5.0'
- gem 'wikicloth', '0.8.1'
+ gem 'wikicloth', '~> 0.8.1'

debian/patches/Gemfile/0090-remove-ee-only-gems.patch

@@ -2,7 +2,7 @@ This gem is used only in gitlab Enterprise Edition
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -81,7 +81,7 @@ gem 'rack-oauth2', '~> 1.21', '>= 1.21.3
+@@ -78,7 +78,7 @@
  gem 'jwt', '~> 2.1'
  
  # Kerberos authentication. EE-only
@@ -11,7 +11,7 @@ This gem is used only in gitlab Enterprise Edition
  gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos
  
  # Spam and anti-bot protection
-@@ -329,7 +329,7 @@ gem 'gon', '~> 6.4'
+@@ -324,7 +324,7 @@
  gem 'request_store', '~> 1.5', '>= 1.5.1'
  gem 'base32', '~> 0.3.0'
  

debian/patches/Gemfile/0120-relax-capybara.patch

@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -378,7 +378,7 @@ if ENV["INCLUDE_TEST_DEPENDS"] == "true"
-   gem 'rspec-benchmark', '~> 0.6.0'
-   gem 'rspec-parameterized', require: false
- 
--  gem 'capybara', '~> 3.35', '~> 3.35.3'
-+  gem 'capybara', '~> 3.12'
-   gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
-   gem 'selenium-webdriver', '~> 3.1','>= 3.142'
- 

debian/patches/Gemfile/0130-remove-capybara-screenshot.patch

@@ -1,10 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -379,7 +379,6 @@ if ENV["INCLUDE_TEST_DEPENDS"] == "true"
-   gem 'rspec-parameterized', require: false
- 
-   gem 'capybara', '~> 3.12'
--  gem 'capybara-screenshot', '~> 1.0', '>= 1.0.22'
-   gem 'selenium-webdriver', '~> 3.1','>= 3.142'
- 
-   gem 'graphlyte', '~> 1.0'

debian/patches/Gemfile/0140-remove-guard-rspec.patch

@@ -1,10 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -390,7 +390,6 @@
-   gem 'concurrent-ruby', '~> 1.1'
-   gem 'test-prof', '~> 1.0', '>= 1.0.7'
-   gem 'rspec_junit_formatter'
--  gem 'guard-rspec'
- 
-   # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
-   gem 'derailed_benchmarks', require: false

debian/patches/Gemfile/0160-relax-rexml.patch

@@ -2,7 +2,7 @@ libruby2.7 has rexml 3.2.3.1 which has latest security fixes
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -54,7 +54,7 @@ gem 'devise-pbkdf2-encryptable', '~> 0.0
+@@ -51,7 +51,7 @@
  gem 'bcrypt', '~> 3.1', '>= 3.1.14'
  gem 'doorkeeper', '~> 5.5'
  gem 'doorkeeper-openid_connect', '~> 1.8'

debian/patches/Gemfile/0180-add-parser-gem.patch

@@ -2,7 +2,7 @@ Forwarded: https://gitlab.com/gitlab-org/gitlab/-/issues/354323
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -39,6 +39,9 @@ gem 'default_value_for', '~> 3.4'
+@@ -36,6 +36,9 @@
  # Supported DBs
  gem 'pg', '~> 1.4.5', '>= 1.4.5'
  

debian/patches/Gemfile/0190-relax-rdoc.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -196,7 +196,7 @@ gem 'gitlab-markup', '~> 1.9', require:
+@@ -191,7 +191,7 @@
  gem 'commonmarker', '~> 0.23.6'
  gem 'kramdown', '~> 2.3', '>=2.3.1'
  gem 'RedCloth', '~> 4.3', '>= 4.3.2'
@@ -8,4 +8,4 @@
 +gem 'rdoc'
  gem 'org-ruby', '~> 0.9.12'
  gem 'creole', '~> 0.5.0'
- gem 'wikicloth', '0.8.1'
+ gem 'wikicloth', '~> 0.8.1'

debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch

@@ -2,8 +2,8 @@ Rakefile need this gem
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -512,5 +512,8 @@
+@@ -514,6 +514,9 @@
- gem 'CFPropertyList'
+ gem 'CFPropertyList', '~> 3.0'
  gem 'app_store_connect'
  
 +# This is required for Rakefile
@@ -11,3 +11,4 @@ Rakefile need this gem
 +
  # For phone verification
  gem 'telesignenterprise', '~> 2.2'
+ 

debian/patches/Gemfile/0230-relax-omniauth-auth0.patch

@@ -11,7 +11,7 @@ Subject: [PATCH] Update omniauth-auth0 rubygem to 3.1
 
 --- a/Gemfile
 +++ b/Gemfile
-@@ -60,7 +60,7 @@ gem 'doorkeeper-openid_connect', '~> 1.8
+@@ -57,7 +57,7 @@
  gem 'rexml', '~> 3.2', '>= 3.2.3.1'
  gem 'ruby-saml', '~> 1.13'
  gem 'omniauth', '~> 2.1'

debian/patches/Gemfile/0250-relax-gitlab-labkit.patch

@@ -1,11 +0,0 @@
---- a/Gemfile
-+++ b/Gemfile
-@@ -349,7 +349,7 @@
- 
- gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
- 
--gem 'gitlab-labkit', '~> 0.30.1'
-+gem 'gitlab-labkit', '~> 0.31'
- gem 'thrift', '>= 0.16.0'
- 
- # I18n

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
-@@ -32,7 +32,7 @@
+@@ -47,7 +47,7 @@
  
  const GraphqlKnownOperationsPlugin = require('./plugins/graphql_known_operations_plugin');
  

debian/patches/nodejs/0020-remove-dev-dependencies.patch

@@ -2,17 +2,21 @@ These are not required in production
 
 --- a/package.json
 +++ b/package.json
-@@ -210,58 +210,6 @@
+@@ -210,63 +210,7 @@
      "yaml": "^2.0.0-10"
    },
    "devDependencies": {
--    "@gitlab/eslint-plugin": "18.1.0",
+-    "@gitlab/eslint-plugin": "18.2.0",
 -    "@gitlab/stylelint-config": "4.1.0",
--    "@graphql-eslint/eslint-plugin": "3.12.0",
+-    "@graphql-eslint/eslint-plugin": "3.16.1",
 -    "@testing-library/dom": "^7.16.2",
 -    "@types/jest": "^28.1.3",
+-    "@vue/compat": "^3.2.47",
+-    "@vue/compiler-sfc": "^3.2.47",
 -    "@vue/test-utils": "1.3.0",
+-    "@vue/test-utils-vue3": "npm:@vue/test-utils@2",
 -    "@vue/vue2-jest": "^28.1.0",
+-    "@vue/vue3-jest": "^29.2.3",
 -    "ajv": "^8.10.0",
 -    "ajv-formats": "^2.1.1",
 -    "axios-mock-adapter": "^1.15.0",
@@ -21,7 +25,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.32.0",
+-    "eslint": "8.36.0",
 -    "eslint-import-resolver-jest": "3.0.2",
 -    "eslint-import-resolver-webpack": "0.13.2",
 -    "eslint-plugin-import": "^2.27.5",
@@ -45,8 +49,6 @@ These are not required in production
 -    "mock-apollo-client": "1.2.0",
 -    "nodemon": "^2.0.19",
 -    "prettier": "2.2.1",
--    "prosemirror-schema-basic": "^1.2.0",
--    "prosemirror-schema-list": "^1.2.2",
 -    "prosemirror-test-builder": "^1.1.0",
 -    "purgecss": "^4.0.3",
 -    "purgecss-from-html": "^4.0.3",
@@ -54,10 +56,14 @@ These are not required in production
 -    "stylelint": "^14.9.1",
 -    "swagger-cli": "^4.0.4",
 -    "timezone-mock": "^1.0.8",
+-    "vue-loader-vue3": "npm:vue-loader@17",
+-    "vue-test-utils-compat": "^0.0.11",
 -    "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"
+   },

debian/patches/nodejs/0040-use-packaged-modules.patch

@@ -19,15 +19,15 @@ Use debian packaged node modules when available
 
 --- a/config/webpack.config.js
 +++ b/config/webpack.config.js
-@@ -19,7 +19,6 @@ const VUE_VERSION = require('vue/package
+@@ -34,7 +34,6 @@
- const { ESBuildMinifyPlugin } = require('esbuild-loader');
+ const { EsbuildPlugin } = require('esbuild-loader');
  
  const webpack = require('webpack');
 -const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
  const { StatsWriterPlugin } = require('webpack-stats-plugin');
  const WEBPACK_VERSION = require('webpack/package.json').version;
  const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
-@@ -289,6 +288,8 @@ module.exports = {
+@@ -346,6 +345,8 @@
  
    entry: generateEntries,
  
@@ -36,7 +36,7 @@ Use debian packaged node modules when available
    output: {
      path: WEBPACK_OUTPUT_PATH,
      publicPath: WEBPACK_PUBLIC_PATH,
-@@ -300,10 +301,15 @@ module.exports = {
+@@ -357,10 +358,15 @@
    },
  
    resolve: {
@@ -53,7 +53,7 @@ Use debian packaged node modules when available
    module: {
      strictExportPresence: true,
      rules: [
-@@ -436,7 +442,7 @@ module.exports = {
+@@ -496,7 +502,7 @@
        },
        {
          test: /\.(eot|ttf|woff|woff2)$/,
@@ -62,7 +62,7 @@ Use debian packaged node modules when available
          loader: 'file-loader',
          options: {
            name: '[name].[contenthash:8].[ext]',
-@@ -857,6 +863,7 @@ module.exports = {
+@@ -914,6 +920,7 @@
  
    node: {
      fs: 'empty', // editorconfig requires 'fs'
@@ -72,7 +72,7 @@ Use debian packaged node modules when available
  };
 --- a/app/assets/javascripts/pdf/index.vue
 +++ b/app/assets/javascripts/pdf/index.vue
-@@ -3,7 +3,7 @@ import { getDocument, GlobalWorkerOption
+@@ -3,7 +3,7 @@
  
  import Page from './page/index.vue';
  
@@ -81,16 +81,3 @@ Use debian packaged node modules when available
  
  export default {
    components: { Page },
---- a/package.json
-+++ b/package.json
-@@ -49,8 +49,8 @@
-   "dependencies": {
-     "@_ueberdosis/prosemirror-tables": "^1.1.3",
-     "@apollo/client": "^3.5.10",
--    "@babel/core": "^7.18.5",
--    "@babel/preset-env": "^7.18.2",
-+    "@babel/core": "link:/usr/share/nodejs/@babel/core",
-+    "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
-     "@cubejs-client/core": "^0.31.15",
-     "@cubejs-client/vue": "^0.31.19",
-     "@gitlab/at.js": "1.5.7",

debian/patches/nodejs/0050-add-babel-plugins.patch

@@ -1,13 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -50,6 +50,10 @@
-     "@_ueberdosis/prosemirror-tables": "^1.1.3",
-     "@apollo/client": "^3.5.10",
-     "@babel/core": "link:/usr/share/nodejs/@babel/core",
-+    "@babel/plugin-proposal-class-properties": "link:/usr/share/nodejs/@babel/plugin-proposal-class-properties",
-+    "@babel/plugin-proposal-json-strings": "link:/usr/share/nodejs/@babel/plugin-proposal-json-strings",
-+    "@babel/plugin-proposal-private-methods": "link:/usr/share/nodejs/@babel/plugin-proposal-private-methods",
-+    "@babel/plugin-syntax-import-meta": "link:/usr/share/nodejs/@babel/plugin-syntax-import-meta",
-     "@babel/preset-env": "link:/usr/share/nodejs/@babel/preset-env",
-     "@cubejs-client/core": "^0.31.15",
-     "@cubejs-client/vue": "^0.31.19",

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
-@@ -211,7 +211,7 @@
+@@ -207,7 +207,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": {
-   },
+      },

debian/patches/nodejs/0070-use-system-katex.patch

@@ -1,6 +1,6 @@
 --- a/package.json
 +++ b/package.json
-@@ -146,7 +146,7 @@
+@@ -143,7 +143,7 @@
      "js-cookie": "^3.0.0",
      "js-yaml": "^3.13.1",
      "jszip": "^3.1.3",

debian/patches/nodejs/0090-lock-mermaid-version.patch

@@ -2,7 +2,7 @@ webpack fails with mermaid 9.4.3 on bullseye, and 9.1.6 is known to work
 
 --- a/package.json
 +++ b/package.json
-@@ -152,7 +152,7 @@
+@@ -149,7 +149,7 @@
      "marked": "^4.0.18",
      "mathjax": "3",
      "mdurl": "^1.0.1",

debian/patches/nodejs/0100-lock-tiptap-versions.patch

@@ -2,78 +2,80 @@ This fixes webpack error when newer versions are pulled by yarn
 
 --- a/package.json
 +++ b/package.json
-@@ -67,39 +67,39 @@
+@@ -63,40 +63,40 @@
      "@rails/actioncable": "6.1.4-7",
      "@rails/ujs": "6.1.4-7",
      "@sourcegraph/code-host-integration": "0.0.84",
--    "@tiptap/core": "^2.0.0-beta.202",
+-    "@tiptap/core": "^2.0.0-beta.220",
--    "@tiptap/extension-blockquote": "^2.0.0-beta.202",
+-    "@tiptap/extension-blockquote": "^2.0.0-beta.220",
--    "@tiptap/extension-bold": "^2.0.0-beta.202",
+-    "@tiptap/extension-bold": "^2.0.0-beta.220",
-+    "@tiptap/core": "2.0.0-beta.202",
++    "@tiptap/core": "2.0.0-beta.220",
-+    "@tiptap/extension-blockquote": "2.0.0-beta.202",
++    "@tiptap/extension-blockquote": "2.0.0-beta.220",
-+    "@tiptap/extension-bold": "2.0.0-beta.202",
++    "@tiptap/extension-bold": "2.0.0-beta.220",
-     "@tiptap/extension-bubble-menu": "2.0.0-beta.200",
+     "@tiptap/extension-bubble-menu": "2.0.0-beta.220",
--    "@tiptap/extension-bullet-list": "^2.0.0-beta.202",
+-    "@tiptap/extension-bullet-list": "^2.0.0-beta.220",
--    "@tiptap/extension-code": "^2.0.0-beta.202",
+-    "@tiptap/extension-code": "^2.0.0-beta.220",
--    "@tiptap/extension-code-block": "^2.0.0-beta.202",
+-    "@tiptap/extension-code-block": "^2.0.0-beta.220",
-+    "@tiptap/extension-bullet-list": "2.0.0-beta.202",
++    "@tiptap/extension-bullet-list": "2.0.0-beta.220",
-+    "@tiptap/extension-code": "2.0.0-beta.202",
++    "@tiptap/extension-code": "2.0.0-beta.220",
-+    "@tiptap/extension-code-block": "2.0.0-beta.202",
++    "@tiptap/extension-code-block": "2.0.0-beta.220",
-     "@tiptap/extension-code-block-lowlight": "2.0.0-beta.202",
+     "@tiptap/extension-code-block-lowlight": "2.0.0-beta.220",
--    "@tiptap/extension-document": "^2.0.0-beta.202",
+-    "@tiptap/extension-document": "^2.0.0-beta.220",
--    "@tiptap/extension-dropcursor": "^2.0.0-beta.202",
+-    "@tiptap/extension-dropcursor": "^2.0.0-beta.220",
--    "@tiptap/extension-gapcursor": "^2.0.0-beta.202",
+-    "@tiptap/extension-gapcursor": "^2.0.0-beta.220",
--    "@tiptap/extension-hard-break": "^2.0.0-beta.202",
+-    "@tiptap/extension-hard-break": "^2.0.0-beta.220",
--    "@tiptap/extension-heading": "^2.0.0-beta.202",
+-    "@tiptap/extension-heading": "^2.0.0-beta.220",
--    "@tiptap/extension-highlight": "^2.0.0-beta.209",
+-    "@tiptap/extension-highlight": "^2.0.0-beta.220",
--    "@tiptap/extension-history": "^2.0.0-beta.202",
+-    "@tiptap/extension-history": "^2.0.0-beta.220",
--    "@tiptap/extension-horizontal-rule": "^2.0.0-beta.202",
+-    "@tiptap/extension-horizontal-rule": "^2.0.0-beta.220",
--    "@tiptap/extension-image": "^2.0.0-beta.202",
+-    "@tiptap/extension-image": "^2.0.0-beta.220",
--    "@tiptap/extension-italic": "^2.0.0-beta.202",
+-    "@tiptap/extension-italic": "^2.0.0-beta.220",
--    "@tiptap/extension-link": "^2.0.0-beta.202",
+-    "@tiptap/extension-link": "^2.0.0-beta.220",
--    "@tiptap/extension-list-item": "^2.0.0-beta.202",
+-    "@tiptap/extension-list-item": "^2.0.0-beta.220",
--    "@tiptap/extension-ordered-list": "^2.0.0-beta.202",
+-    "@tiptap/extension-ordered-list": "^2.0.0-beta.220",
--    "@tiptap/extension-paragraph": "^2.0.0-beta.202",
+-    "@tiptap/extension-paragraph": "^2.0.0-beta.220",
--    "@tiptap/extension-strike": "^2.0.0-beta.202",
+-    "@tiptap/extension-strike": "^2.0.0-beta.220",
--    "@tiptap/extension-subscript": "^2.0.0-beta.202",
+-    "@tiptap/extension-subscript": "^2.0.0-beta.220",
--    "@tiptap/extension-superscript": "^2.0.0-beta.202",
+-    "@tiptap/extension-superscript": "^2.0.0-beta.220",
--    "@tiptap/extension-table": "^2.0.0-beta.202",
+-    "@tiptap/extension-table": "^2.0.0-beta.220",
--    "@tiptap/extension-table-cell": "^2.0.0-beta.202",
+-    "@tiptap/extension-table-cell": "^2.0.0-beta.220",
--    "@tiptap/extension-table-header": "^2.0.0-beta.202",
+-    "@tiptap/extension-table-header": "^2.0.0-beta.220",
--    "@tiptap/extension-table-row": "^2.0.0-beta.202",
+-    "@tiptap/extension-table-row": "^2.0.0-beta.220",
--    "@tiptap/extension-task-item": "^2.0.0-beta.202",
+-    "@tiptap/extension-task-item": "^2.0.0-beta.220",
--    "@tiptap/extension-task-list": "^2.0.0-beta.202",
+-    "@tiptap/extension-task-list": "^2.0.0-beta.220",
--    "@tiptap/extension-text": "^2.0.0-beta.202",
+-    "@tiptap/extension-text": "^2.0.0-beta.220",
--    "@tiptap/suggestion": "^2.0.0-beta.202",
+-    "@tiptap/pm": "^2.0.0-beta.220",
-+    "@tiptap/extension-document": "2.0.0-beta.202",
+-    "@tiptap/suggestion": "^2.0.0-beta.220",
-+    "@tiptap/extension-dropcursor": "2.0.0-beta.202",
++    "@tiptap/extension-document": "2.0.0-beta.220",
-+    "@tiptap/extension-gapcursor": "2.0.0-beta.202",
++    "@tiptap/extension-dropcursor": "2.0.0-beta.220",
-+    "@tiptap/extension-hard-break": "2.0.0-beta.202",
++    "@tiptap/extension-gapcursor": "2.0.0-beta.220",
-+    "@tiptap/extension-heading": "2.0.0-beta.202",
++    "@tiptap/extension-hard-break": "2.0.0-beta.220",
-+    "@tiptap/extension-highlight": "2.0.0-beta.209",
++    "@tiptap/extension-heading": "2.0.0-beta.220",
-+    "@tiptap/extension-history": "2.0.0-beta.202",
++    "@tiptap/extension-highlight": "2.0.0-beta.220",
-+    "@tiptap/extension-horizontal-rule": "2.0.0-beta.202",
++    "@tiptap/extension-history": "2.0.0-beta.220",
-+    "@tiptap/extension-image": "2.0.0-beta.202",
++    "@tiptap/extension-horizontal-rule": "2.0.0-beta.220",
-+    "@tiptap/extension-italic": "2.0.0-beta.202",
++    "@tiptap/extension-image": "2.0.0-beta.220",
-+    "@tiptap/extension-link": "2.0.0-beta.202",
++    "@tiptap/extension-italic": "2.0.0-beta.220",
-+    "@tiptap/extension-list-item": "2.0.0-beta.202",
++    "@tiptap/extension-link": "2.0.0-beta.220",
-+    "@tiptap/extension-ordered-list": "2.0.0-beta.202",
++    "@tiptap/extension-list-item": "2.0.0-beta.220",
-+    "@tiptap/extension-paragraph": "2.0.0-beta.202",
++    "@tiptap/extension-ordered-list": "2.0.0-beta.220",
-+    "@tiptap/extension-strike": "2.0.0-beta.202",
++    "@tiptap/extension-paragraph": "2.0.0-beta.220",
-+    "@tiptap/extension-subscript": "2.0.0-beta.202",
++    "@tiptap/extension-strike": "2.0.0-beta.220",
-+    "@tiptap/extension-superscript": "2.0.0-beta.202",
++    "@tiptap/extension-subscript": "2.0.0-beta.220",
-+    "@tiptap/extension-table": "2.0.0-beta.202",
++    "@tiptap/extension-superscript": "2.0.0-beta.220",
-+    "@tiptap/extension-table-cell": "2.0.0-beta.202",
++    "@tiptap/extension-table": "2.0.0-beta.220",
-+    "@tiptap/extension-table-header": "2.0.0-beta.202",
++    "@tiptap/extension-table-cell": "2.0.0-beta.220",
-+    "@tiptap/extension-table-row": "2.0.0-beta.202",
++    "@tiptap/extension-table-header": "2.0.0-beta.220",
-+    "@tiptap/extension-task-item": "2.0.0-beta.202",
++    "@tiptap/extension-table-row": "2.0.0-beta.220",
-+    "@tiptap/extension-task-list": "2.0.0-beta.202",
++    "@tiptap/extension-task-item": "2.0.0-beta.220",
-+    "@tiptap/extension-text": "2.0.0-beta.202",
++    "@tiptap/extension-task-list": "2.0.0-beta.220",
-+    "@tiptap/suggestion": "2.0.0-beta.202",
++    "@tiptap/extension-text": "2.0.0-beta.220",
-     "@tiptap/vue-2": "2.0.0-beta.200",
++    "@tiptap/pm": "2.0.0-beta.220",
++    "@tiptap/suggestion": "2.0.0-beta.220",
+     "@tiptap/vue-2": "2.0.0-beta.220",
      "apollo-upload-client": "15.0.0",
      "apollo3-cache-persist": "^0.14.1",
-@@ -220,7 +220,9 @@
+@@ -216,7 +216,9 @@
    },
    "resolutions": {
      "chokidar": "^3.5.3",

debian/patches/series

@@ -4,9 +4,6 @@ Gemfile/0030-make-test-dependencies-conditional.patch
 Gemfile/0040-relax-httparty.patch
 Gemfile/0050-relax-rdoc.patch
 Gemfile/0090-remove-ee-only-gems.patch
-Gemfile/0120-relax-capybara.patch
-Gemfile/0130-remove-capybara-screenshot.patch
-Gemfile/0140-remove-guard-rspec.patch
 Gemfile/0160-relax-rexml.patch
 Gemfile/0180-add-parser-gem.patch
 Gemfile/0190-relax-rdoc.patch
@@ -14,12 +11,10 @@ Gemfile/0200-add-gitlab-dangerfiles.patch
 Gemfile/0210-comment-out-openssl.patch
 Gemfile/0220-relax-oj-in-ipynbdiff.patch
 Gemfile/0230-relax-omniauth-auth0.patch
-Gemfile/0250-relax-gitlab-labkit.patch
 nodejs/0010-set-webpack-root.patch
 nodejs/0020-remove-dev-dependencies.patch
 nodejs/0030-use-yarnpkg.patch
 nodejs/0040-use-packaged-modules.patch
-nodejs/0050-add-babel-plugins.patch
 nodejs/0060-use-system-yaml.patch
 nodejs/0070-use-system-katex.patch
 nodejs/0090-lock-mermaid-version.patch

debian/patches/tweaks/0060-fix-relative-paths.patch

@@ -27,10 +27,11 @@ Debian specific patch to adapt to debian policy mandated paths
  Rails.application.initialize!
 --- a/config/initializers_before_autoloader/001_fast_gettext.rb
 +++ b/config/initializers_before_autoloader/001_fast_gettext.rb
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,6 @@
  # frozen_string_literal: true
  
 -require_relative '../../lib/gitlab/i18n'
 +require_relative '/usr/share/gitlab/lib/gitlab/i18n'
+ require_relative '../../lib/gitlab/i18n/pluralization'
  
  Gitlab::I18n.setup(domain: 'gitlab', default_locale: :en)