Refresh patches

debian/patches/0050-relax-stable-libs.patch

@@ -315,7 +315,7 @@ gitlab Gemfile
  
  # Sentry integration
  gem 'sentry-raven', '~> 3.0'
-@@ -308,19 +308,19 @@
+@@ -308,10 +308,10 @@
  # PostgreSQL query parsing
  gem 'gitlab-pg_query', '~> 1.3', require: 'pg_query'
  
@@ -325,7 +325,10 @@ gitlab Gemfile
  # LabKit: Tracing and Correlation
 -gem 'gitlab-labkit', '0.13.3'
 +gem 'gitlab-labkit', '~> 0.13.3'
- 
+ # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0
+ # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900
+ gem 'thrift', '>= 0.14.0'
+@@ -319,11 +319,11 @@
  # I18n
  gem 'ruby_parser', '~> 3.15', require: false
  gem 'rails-i18n', '~> 6.0'
@@ -339,7 +342,7 @@ gitlab Gemfile
  
  # Perf bar
  gem 'peek', '~> 1.1'
-@@ -352,37 +352,37 @@
+@@ -355,37 +355,37 @@
  
  group :development, :test do
    gem 'deprecation_toolkit', '~> 1.5.1', require: false
@@ -388,7 +391,7 @@ gitlab Gemfile
  
    gem 'timecop', '~> 0.9.1'
  
-@@ -404,18 +404,18 @@
+@@ -407,18 +407,18 @@
  end
  
  group :test do
@@ -413,7 +416,7 @@ gitlab Gemfile
    gem 'rails-controller-testing'
    gem 'concurrent-ruby', '~> 1.1'
    gem 'test-prof', '~> 0.12.0'
-@@ -434,7 +434,7 @@
+@@ -437,7 +437,7 @@
  gem 'email_reply_trimmer', '~> 0.1'
  gem 'html2text'
  
@@ -422,7 +425,7 @@ gitlab Gemfile
  gem 'stackprof', '~> 0.2.15', require: false
  gem 'rbtrace', '~> 0.4', require: false
  gem 'memory_profiler', '~> 0.9', require: false
-@@ -448,8 +448,8 @@
+@@ -451,8 +451,8 @@
  gem 'health_check', '~> 3.0'
  
  # System information
@@ -433,7 +436,7 @@ gitlab Gemfile
  
  # NTP client
  gem 'net-ntp'
-@@ -465,13 +465,13 @@
+@@ -468,13 +468,13 @@
  end
  
  # Gitaly GRPC protocol definitions
@@ -450,7 +453,7 @@ gitlab Gemfile
  
  # Feature toggles
  gem 'flipper', '~> 0.17.1'
-@@ -490,12 +490,12 @@
+@@ -493,12 +493,12 @@
  # Countries list
  gem 'countries', '~> 3.0'
  
@@ -465,7 +468,7 @@ gitlab Gemfile
  
  # Locked as long as quoted-printable encoding issues are not resolved
  # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
-@@ -509,12 +509,12 @@
+@@ -512,12 +512,12 @@
  gem 'valid_email', '~> 0.1'
  
  # JSON

debian/patches/0100-remove-development-test.patch

@@ -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'
-@@ -318,7 +317,6 @@
+@@ -321,7 +320,6 @@
  gem 'rails-i18n', '~> 6.0'
  gem 'gettext_i18n_rails', '~> 1.8'
  gem 'gettext_i18n_rails_js', '~> 1.3'
@@ -18,7 +18,7 @@ Bundler will fail when it can't find these locally
  
  gem 'batch-loader', '~> 1.4'
  
-@@ -337,19 +335,6 @@
+@@ -340,19 +338,6 @@
    gem 'raindrops', '~> 0.18'
  end
  
@@ -38,7 +38,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'
-@@ -371,12 +356,6 @@
+@@ -374,12 +359,6 @@
    gem 'spring', '~> 2.1'
    gem 'spring-commands-rspec', '~> 1.0', '>= 1.0.4'
  
@@ -51,7 +51,7 @@ Bundler will fail when it can't find these locally
    gem 'benchmark-ips', '~> 2.3', require: false
  
    gem 'knapsack', '~> 1.17'
-@@ -393,16 +372,6 @@
+@@ -396,16 +375,6 @@
    gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
  end
  

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
-@@ -335,7 +335,7 @@
+@@ -338,7 +338,7 @@
    gem 'raindrops', '~> 0.18'
  end
  
@@ -11,7 +11,7 @@ Make test dependencies conditional so we can enable them when running autopkgtes
    gem 'deprecation_toolkit', '~> 1.5.1', require: false
    gem 'bullet', '~> 6.1'
    gem 'pry-byebug', '~> 3.9', platform: :mri
-@@ -370,9 +370,7 @@
+@@ -373,9 +373,7 @@
    gem 'parallel', '~> 1.19', require: false
  
    gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false

debian/patches/0499-10-relax-capybara.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -365,7 +365,7 @@
+@@ -368,7 +368,7 @@
    gem 'rspec_profiling', '~> 0.0.6'
    gem 'rspec-parameterized', require: false
  

debian/patches/0499-20-remove-capybara-screenshot.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -366,7 +366,6 @@
+@@ -369,7 +369,6 @@
    gem 'rspec-parameterized', require: false
  
    gem 'capybara', '~> 3.12'

debian/patches/0499-30-remove-guard-rspec.patch

@@ -1,6 +1,6 @@
 --- a/Gemfile
 +++ b/Gemfile
-@@ -375,7 +375,6 @@
+@@ -378,7 +378,6 @@
    gem 'concurrent-ruby', '~> 1.1'
    gem 'test-prof', '~> 0.12.0'
    gem 'rspec_junit_formatter'

debian/patches/0530-typescript-yarnpkg-comapt.patch

@@ -4,7 +4,7 @@ Bug: https://github.com/yarnpkg/berry/pull/2440
 
 --- a/package.json
 +++ b/package.json
-@@ -167,7 +167,8 @@
+@@ -166,7 +166,8 @@
    },
    "resolutions": {
      "chokidar": "^3.4.0",

debian/patches/0740-use-packaged-modules.patch

@@ -227,7 +227,7 @@ Use debian packaged node modules when available
      "select2": "3.5.2-browserify",
 @@ -134,26 +134,25 @@
      "style-loader": "^1.1.3",
-     "swagger-ui-dist": "^3.32.4",
+     "swagger-ui-dist": "^3.43.0",
      "three": "^0.84.0",
 -    "three-orbit-controls": "^82.1.0",
 +    "three-orbit-controls": "link:/usr/share/nodejs/three-orbit-controls",