diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-17 01:19:47 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-06-17 01:19:47 +0000 |
| commit | d170a0fb7af727470a23f94e102c6536f5df4a85 (patch) | |
| tree | 0c5beea5a08d90242ecbc5c07f45b443d60c3f0b | |
| parent | 32224610c0f9e096e715636d01c0058fd0aa22c8 (diff) | |
| parent | 0d19ebe4669d66188c7ceb70c29cb98d2e22a7ed (diff) | |
| download | gitlab-ce-d170a0fb7af727470a23f94e102c6536f5df4a85.tar.gz | |
Merge branch 'sh-bump-ruby-labkit' into 'master'
Upgrade gitlab-labkit to 0.3.0
See merge request gitlab-org/gitlab-ce!29728
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -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 46c7991515c..4cebf73f17a 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) |