summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-06-15 10:46:09 -0700
committerAsh McKenzie <amckenzie@gitlab.com>2019-06-17 09:36:59 +1000
commit0d19ebe4669d66188c7ceb70c29cb98d2e22a7ed (patch)
tree2e7ce754eb010e57050d3a691c67399274c7c4fa /Gemfile.lock
parent82822945d446acf44176a36da38675e98ca17616 (diff)
downloadgitlab-ce-0d19ebe4669d66188c7ceb70c29cb98d2e22a7ed.tar.gz
Upgrade gitlab-labkit to 0.3.0
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
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 05a926b1b6c..bab758a348b 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)