diff --git a/debian/control b/debian/control index 960e4bdca1..0e9f559e6a 100644 --- a/debian/control +++ b/debian/control @@ -356,7 +356,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # ruby-premailer-rails (>= 1.10.3-2~), # LabKit: Tracing and Correlation - ruby-gitlab-labkit (>= 0.30.1~), + ruby-gitlab-labkit (>= 0.31~), # 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 ruby-thrift (>= 0.16~), diff --git a/debian/patches/Gemfile/0140-remove-guard-rspec.patch b/debian/patches/Gemfile/0140-remove-guard-rspec.patch index cbf42bdb8d..932b265b26 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 -@@ -369,7 +369,6 @@ +@@ -390,7 +390,6 @@ gem 'concurrent-ruby', '~> 1.1' gem 'test-prof', '~> 1.0', '>= 1.0.7' gem 'rspec_junit_formatter' diff --git a/debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch b/debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch index d839aec67d..2d5b4ac515 100644 --- a/debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch +++ b/debian/patches/Gemfile/0200-add-gitlab-dangerfiles.patch @@ -2,7 +2,7 @@ Rakefile need this gem --- a/Gemfile +++ b/Gemfile -@@ -491,5 +491,8 @@ +@@ -512,5 +512,8 @@ gem 'CFPropertyList' gem 'app_store_connect' diff --git a/debian/patches/Gemfile/0250-relax-gitlab-labkit.patch b/debian/patches/Gemfile/0250-relax-gitlab-labkit.patch new file mode 100644 index 0000000000..91fa412b4c --- /dev/null +++ b/debian/patches/Gemfile/0250-relax-gitlab-labkit.patch @@ -0,0 +1,11 @@ +--- 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 diff --git a/debian/patches/nodejs/0070-use-system-katex.patch b/debian/patches/nodejs/0070-use-system-katex.patch index f9803a2d01..c18c9bb095 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 -@@ -147,7 +147,7 @@ +@@ -146,7 +146,7 @@ "js-cookie": "^3.0.0", "js-yaml": "^3.13.1", "jszip": "^3.1.3", diff --git a/debian/patches/nodejs/0090-lock-mermaid-version.patch b/debian/patches/nodejs/0090-lock-mermaid-version.patch index 5782b74321..cb2b8d31f8 100644 --- a/debian/patches/nodejs/0090-lock-mermaid-version.patch +++ b/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 -@@ -153,7 +153,7 @@ +@@ -152,7 +152,7 @@ "marked": "^4.0.18", "mathjax": "3", "mdurl": "^1.0.1", diff --git a/debian/patches/series b/debian/patches/series index 9d189931b1..3898a4dd1e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,6 +14,7 @@ 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