summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-08-10 07:36:01 -0700
committerStan Hu <stanhu@gmail.com>2019-08-10 07:36:01 -0700
commit1aac70dab2cb02afd634c96c41ef7a38ba1238a2 (patch)
tree885e98a55e888f984cb73750465d866f538937f0
parentea671dec7f9db06c1d45ddd1536c1af194de8f62 (diff)
downloadgitlab-ce-sh-update-ruby-labkit.tar.gz
Update gitlab-labkit to 0.4.2sh-update-ruby-labkit
This relaxes the gRPC version so that it can be updated. Also adds cache support for distributed tracing. Full release notes: https://gitlab.com/gitlab-org/labkit-ruby/-/tags
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 22746f9c5ae..05ce1016e40 100644
--- a/Gemfile
+++ b/Gemfile
@@ -283,7 +283,7 @@ gem 'sentry-raven', '~> 2.9'
gem 'premailer-rails', '~> 1.9.7'
# LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.3.0'
+gem 'gitlab-labkit', '~> 0.4.2'
# I18n
gem 'ruby_parser', '~> 3.8', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 80f36a9457c..f01a01b7670 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -312,10 +312,10 @@ GEM
gitaly-proto (1.37.0)
grpc (~> 1.0)
github-markup (1.7.0)
- gitlab-labkit (0.3.0)
+ gitlab-labkit (0.4.2)
actionpack (~> 5)
activesupport (~> 5)
- grpc (~> 1.19.0)
+ grpc (~> 1.19)
jaeger-client (~> 0.10)
opentracing (~> 0.4)
gitlab-markup (1.7.0)
@@ -1098,7 +1098,7 @@ DEPENDENCIES
gettext_i18n_rails_js (~> 1.3)
gitaly-proto (~> 1.37.0)
github-markup (~> 1.7.0)
- gitlab-labkit (~> 0.3.0)
+ gitlab-labkit (~> 0.4.2)
gitlab-markup (~> 1.7.0)
gitlab-sidekiq-fetcher (= 0.5.1)
gitlab-styles (~> 2.7)