diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-08-12 15:25:36 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-08-12 15:25:36 +0000 |
| commit | 216acee11dfecbb095e151d1b1cac4203d08355b (patch) | |
| tree | e5703b370b29e8c67af33eb29a10e9db36eb70d0 | |
| parent | d2ecbd747b148d965a7f7ab4f438ad02ca21faf9 (diff) | |
| parent | 1aac70dab2cb02afd634c96c41ef7a38ba1238a2 (diff) | |
| download | gitlab-ce-216acee11dfecbb095e151d1b1cac4203d08355b.tar.gz | |
Merge branch 'sh-update-ruby-labkit' into 'master'
Update gitlab-labkit to 0.4.2
See merge request gitlab-org/gitlab-ce!31685
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
@@ -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 68c40cd19f7..3177951c9d6 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) |