Relax dependency on gitlab-labkit (to match gitaly)
This commit is contained in:
parent
d442bfe2ca
commit
b6bdeac1c6
3 changed files with 13 additions and 1 deletions
2
debian/control
vendored
2
debian/control
vendored
|
@ -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~),
|
||||
|
|
11
debian/patches/Gemfile/0220-relax-gitlab-labkit.patch
vendored
Normal file
11
debian/patches/Gemfile/0220-relax-gitlab-labkit.patch
vendored
Normal file
|
@ -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
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue