Skip to content
Snippets Groups Projects
Commit 216acee1 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'sh-update-ruby-labkit' into 'master'

Update gitlab-labkit to 0.4.2

See merge request gitlab-org/gitlab-ce!31685
parents d2ecbd74 1aac70da
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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)
Loading
Loading
@@ -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)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment