Commit d170a0fb authored by Ash McKenzie's avatar Ash McKenzie

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

Upgrade gitlab-labkit to 0.3.0

See merge request gitlab-org/gitlab-ce!29728
parents 32224610 0d19ebe4
...@@ -281,7 +281,7 @@ gem 'sentry-raven', '~> 2.9' ...@@ -281,7 +281,7 @@ gem 'sentry-raven', '~> 2.9'
gem 'premailer-rails', '~> 1.9.7' gem 'premailer-rails', '~> 1.9.7'
# LabKit: Tracing and Correlation # LabKit: Tracing and Correlation
gem 'gitlab-labkit', '~> 0.2.0' gem 'gitlab-labkit', '~> 0.3.0'
# I18n # I18n
gem 'ruby_parser', '~> 3.8', require: false gem 'ruby_parser', '~> 3.8', require: false
......
...@@ -306,10 +306,10 @@ GEM ...@@ -306,10 +306,10 @@ GEM
github-markup (1.7.0) github-markup (1.7.0)
gitlab-default_value_for (3.1.1) gitlab-default_value_for (3.1.1)
activerecord (>= 3.2.0, < 6.0) activerecord (>= 3.2.0, < 6.0)
gitlab-labkit (0.2.0) gitlab-labkit (0.3.0)
actionpack (~> 5) actionpack (~> 5)
activesupport (~> 5) activesupport (~> 5)
grpc (~> 1.15) grpc (~> 1.19.0)
jaeger-client (~> 0.10) jaeger-client (~> 0.10)
opentracing (~> 0.4) opentracing (~> 0.4)
gitlab-markup (1.7.0) gitlab-markup (1.7.0)
...@@ -1094,7 +1094,7 @@ DEPENDENCIES ...@@ -1094,7 +1094,7 @@ DEPENDENCIES
gitaly-proto (~> 1.32.0) gitaly-proto (~> 1.32.0)
github-markup (~> 1.7.0) github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1) gitlab-default_value_for (~> 3.1.1)
gitlab-labkit (~> 0.2.0) gitlab-labkit (~> 0.3.0)
gitlab-markup (~> 1.7.0) gitlab-markup (~> 1.7.0)
gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-sidekiq-fetcher (~> 0.4.0)
gitlab-styles (~> 2.7) gitlab-styles (~> 2.7)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment