diff --git a/debian/control b/debian/control index 55ac1885a8..70d8f48ed5 100644 --- a/debian/control +++ b/debian/control @@ -349,7 +349,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # ruby-premailer-rails (>= 1.10.3-2~), # LabKit: Tracing and Correlation - ruby-gitlab-labkit (>= 0.23~), + ruby-gitlab-labkit (>= 0.25~), # 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/0220-relax-gitlab-labkit.patch b/debian/patches/Gemfile/0220-relax-gitlab-labkit.patch new file mode 100644 index 0000000000..169af88f07 --- /dev/null +++ b/debian/patches/Gemfile/0220-relax-gitlab-labkit.patch @@ -0,0 +1,11 @@ +--- a/Gemfile ++++ b/Gemfile +@@ -337,7 +337,7 @@ + gem 'premailer-rails', '~> 1.10','>= 1.10.3' + + # LabKit: Tracing and Correlation +-gem 'gitlab-labkit', '~> 0.24.0' ++gem 'gitlab-labkit', '~> 0.25.0' + gem 'thrift', '>= 0.16.0' + + # I18n diff --git a/debian/patches/series b/debian/patches/series index d093a651dd..749473aaba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,6 +12,7 @@ Gemfile/0180-add-parser-gem.patch Gemfile/0190-relax-rdoc.patch Gemfile/0200-add-gitlab-dangerfiles.patch Gemfile/0210-comment-out-openssl.patch +Gemfile/0220-relax-gitlab-labkit.patch nodejs/0010-set-webpack-root.patch nodejs/0020-remove-dev-dependencies.patch nodejs/0030-use-yarnpkg.patch