summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-06-15 10:46:09 -0700
committerStan Hu <stanhu@gmail.com>2019-06-15 10:46:09 -0700
commitfd6513200b4c956019a2f0559e46d2ae07980cec (patch)
treef7a0e010cef21e8e75f7621a9fba2241efd22681
parent07cb81a31efbee2c9a4cfacadb2967e189f1447a (diff)
downloadgitlab-ce-sh-bump-ruby-labkit.tar.gz
Upgrade gitlab-labkit to 0.3.0sh-bump-ruby-labkit
This matches the version used in Gitaly, bumps the gRPC version to be aligned with GitLab CE/EE, and adds gRPC interceptor support: https://gitlab.com/gitlab-org/labkit-ruby/compare/v0.2.0...v0.3.0
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index a5dccd2ef24..c9a95fb7a36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -281,7 +281,7 @@ gem 'sentry-raven', '~> 2.9'
gem 'premailer-rails', '~> 1.9.7'
# LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.2.0'
+gem 'gitlab-labkit', '~> 0.3.0'
# I18n
gem 'ruby_parser', '~> 3.8', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 0159d1f96e8..0ce4d4f01ce 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -306,10 +306,10 @@ GEM
github-markup (1.7.0)
gitlab-default_value_for (3.1.1)
activerecord (>= 3.2.0, < 6.0)
- gitlab-labkit (0.2.0)
+ gitlab-labkit (0.3.0)
actionpack (~> 5)
activesupport (~> 5)
- grpc (~> 1.15)
+ grpc (~> 1.19.0)
jaeger-client (~> 0.10)
opentracing (~> 0.4)
gitlab-markup (1.7.0)
@@ -1094,7 +1094,7 @@ DEPENDENCIES
gitaly-proto (~> 1.32.0)
github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1)
- gitlab-labkit (~> 0.2.0)
+ gitlab-labkit (~> 0.3.0)
gitlab-markup (~> 1.7.0)
gitlab-sidekiq-fetcher (~> 0.4.0)
gitlab-styles (~> 2.7)