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

Update gitlab-labkit to 0.12.1 See merge request gitlab-org/gitlab!37055

Merge branch 'update-labkit-ruby-0.12.1' into 'master'
Update gitlab-labkit to 0.12.1 See merge request gitlab-org/gitlab!37055
c238beb6 · Bob Van Landuyt · 11a6d19c · 2a7be152 · c238beb6 · c238beb6
Commit c238beb6 authored Jul 16, 2020 by Bob Van Landuyt
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -306,7 +306,7 @@ gem 'sentry-raven', '~> 2.9'
 gem 'premailer-rails', '~> 1.10.3'
 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '0.12.0'
+gem 'gitlab-labkit', '0.12.1'
 # I18n
 gem 'ruby_parser', '~> 3.8', require: false

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -396,7 +396,7 @@ GEM
    github-markup (1.7.0)
    gitlab-chronic (0.10.5)
      numerizer (~> 0.2)
-    gitlab-labkit (0.12.0)
+    gitlab-labkit (0.12.1)
      actionpack (>= 5.0.0, < 6.1.0)
      activesupport (>= 5.0.0, < 6.1.0)
      grpc (~> 1.19)
@@ -1254,7 +1254,7 @@ DEPENDENCIES
  gitaly (~> 13.2.0.pre.rc2)
  github-markup (~> 1.7.0)
  gitlab-chronic (~> 0.10.5)
-  gitlab-labkit (= 0.12.0)
+  gitlab-labkit (= 0.12.1)
  gitlab-license (~> 1.0)
  gitlab-mail_room (~> 0.0.6)
  gitlab-markup (~> 1.7.1)