Relax dependency on gitlab-labkit (for matching with gitaly requirement)

This commit is contained in:
Pirate Praveen 2021-03-27 16:07:33 +05:30
parent 538b117167
commit bd4ed8f3e0
3 changed files with 15 additions and 1 deletions

2
debian/control vendored
View file

@ -277,7 +277,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
#
ruby-premailer-rails (>= 1.10.3-2~),
# LabKit: Tracing and Correlation
ruby-gitlab-labkit (>= 0.14~),
ruby-gitlab-labkit (>= 0.15~),
# 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.14~),

View file

@ -0,0 +1,13 @@
gitaly needs gitlab-labkit ~> 0.15.0
--- a/Gemfile
+++ b/Gemfile
@@ -297,7 +297,7 @@
gem 'premailer-rails', '~> 1.10', '>= 1.10.3'
# LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.14.0'
+gem 'gitlab-labkit', '~> 0.15.0'
# 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'

View file

@ -17,6 +17,7 @@
0499-40-relax-rouge.patch
0499-70-relax-graphlient.patch
0499-90-relax-webrick.patch
0499-91-relax-gitlab-labkit.patch
0500-set-webpack-root.patch
0510-remove-dev-dependencies.patch
0520-add-system-lib-path-for-webpack.patch