Commit c238beb6 authored by Bob Van Landuyt's avatar Bob Van Landuyt

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

Update gitlab-labkit to 0.12.1

See merge request gitlab-org/gitlab!37055
parents 11a6d19c 2a7be152
...@@ -306,7 +306,7 @@ gem 'sentry-raven', '~> 2.9' ...@@ -306,7 +306,7 @@ gem 'sentry-raven', '~> 2.9'
gem 'premailer-rails', '~> 1.10.3' gem 'premailer-rails', '~> 1.10.3'
# LabKit: Tracing and Correlation # LabKit: Tracing and Correlation
gem 'gitlab-labkit', '0.12.0' gem 'gitlab-labkit', '0.12.1'
# I18n # I18n
gem 'ruby_parser', '~> 3.8', require: false gem 'ruby_parser', '~> 3.8', require: false
......
...@@ -396,7 +396,7 @@ GEM ...@@ -396,7 +396,7 @@ GEM
github-markup (1.7.0) github-markup (1.7.0)
gitlab-chronic (0.10.5) gitlab-chronic (0.10.5)
numerizer (~> 0.2) numerizer (~> 0.2)
gitlab-labkit (0.12.0) gitlab-labkit (0.12.1)
actionpack (>= 5.0.0, < 6.1.0) actionpack (>= 5.0.0, < 6.1.0)
activesupport (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0)
grpc (~> 1.19) grpc (~> 1.19)
...@@ -1254,7 +1254,7 @@ DEPENDENCIES ...@@ -1254,7 +1254,7 @@ DEPENDENCIES
gitaly (~> 13.2.0.pre.rc2) gitaly (~> 13.2.0.pre.rc2)
github-markup (~> 1.7.0) github-markup (~> 1.7.0)
gitlab-chronic (~> 0.10.5) gitlab-chronic (~> 0.10.5)
gitlab-labkit (= 0.12.0) gitlab-labkit (= 0.12.1)
gitlab-license (~> 1.0) gitlab-license (~> 1.0)
gitlab-mail_room (~> 0.0.6) gitlab-mail_room (~> 0.0.6)
gitlab-markup (~> 1.7.1) gitlab-markup (~> 1.7.1)
......
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