diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2020-11-05 04:27:48 +0300 |
|---|---|---|
| committer | James Fargher <proglottis@gmail.com> | 2020-11-05 04:27:48 +0300 |
| commit | 840f339420dd3a731b288aba5ecfc89c9f9cd0aa (patch) | |
| tree | 2e3cd2cbf4fdb6e1cf144377fb8832e2c7bdef18 | |
| parent | 78487b6231f7f0b0ae2c6db34f1495adc47268e8 (diff) | |
Use labkit-ruby 0.13.2
| -rw-r--r-- | changelogs/unreleased/jv-labkit-ruby-0-13-2.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 8 |
3 files changed, 10 insertions, 5 deletions
diff --git a/changelogs/unreleased/jv-labkit-ruby-0-13-2.yml b/changelogs/unreleased/jv-labkit-ruby-0-13-2.yml new file mode 100644 index 000000000..b12bb5a0a --- /dev/null +++ b/changelogs/unreleased/jv-labkit-ruby-0-13-2.yml @@ -0,0 +1,5 @@ +--- +title: Use labkit-ruby 0.13.2 +merge_request: 2743 +author: +type: other diff --git a/ruby/Gemfile b/ruby/Gemfile index 7f336756e..d8564dca8 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -13,7 +13,7 @@ gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.13.0' +gem 'gitlab-labkit', '~> 0.13.2' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index cf62166fd..a633e067f 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -62,11 +62,11 @@ GEM gitlab-gollum-rugged_adapter (0.4.4.2) mime-types (>= 1.15) rugged (~> 0.25) - gitlab-labkit (0.13.0) + gitlab-labkit (0.13.2) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) grpc (~> 1.19) - jaeger-client (~> 0.10) + jaeger-client (~> 1.1) opentracing (~> 0.4) redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.1) @@ -80,7 +80,7 @@ GEM i18n (1.8.5) concurrent-ruby (~> 1.0) ice_nine (0.11.2) - jaeger-client (0.10.0) + jaeger-client (1.1.0) opentracing (~> 0.3) thrift json (2.3.1) @@ -200,7 +200,7 @@ DEPENDENCIES github-linguist (~> 7.11) gitlab-gollum-lib (~> 4.2.7.9) gitlab-gollum-rugged_adapter (~> 0.4.4.2) - gitlab-labkit (~> 0.13.0) + gitlab-labkit (~> 0.13.2) gitlab-markup (~> 1.7.1) google-protobuf (~> 3.12) grpc (~> 1.30.2) |