diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-08-27 07:40:37 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-08-27 07:46:14 +0300 |
| commit | c5af05812a6677228b31b195af44190b0ba4fb92 (patch) | |
| tree | 788868ce3f5eb2ed6c74564b0102b69d8887d424 | |
| parent | 56a370623544ef831ee9b4d5191a18151a2dfdee (diff) | |
Update Ruby gitlab-labkit to 0.5.2
This saves a little disk space and matches what is being used in CE in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/30238.
| -rw-r--r-- | changelogs/unreleased/sh-upgrade-gitlab-labkit.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 8 |
3 files changed, 11 insertions, 4 deletions
diff --git a/changelogs/unreleased/sh-upgrade-gitlab-labkit.yml b/changelogs/unreleased/sh-upgrade-gitlab-labkit.yml new file mode 100644 index 000000000..47df9df5d --- /dev/null +++ b/changelogs/unreleased/sh-upgrade-gitlab-labkit.yml @@ -0,0 +1,5 @@ +--- +title: Update Ruby gitlab-labkit to 0.5.2 +merge_request: 1453 +author: +type: other diff --git a/ruby/Gemfile b/ruby/Gemfile index 1043349de..9478dc9a8 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -16,7 +16,7 @@ gem 'faraday', '~> 0.12' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.4.0' +gem 'gitlab-labkit', '~> 0.5.0' # 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 c85b93dc1..cc0252a88 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -71,12 +71,13 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16) posix-spawn (~> 0.3) - gitlab-labkit (0.4.2) + gitlab-labkit (0.5.2) actionpack (~> 5) activesupport (~> 5) grpc (~> 1.19) jaeger-client (~> 0.10) opentracing (~> 0.4) + redis (> 3.0.0, < 5.0.0) gitlab-markup (1.7.0) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) @@ -137,7 +138,7 @@ GEM rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) + rails-html-sanitizer (1.2.0) loofah (~> 2.2, >= 2.2.2) rainbow (3.0.0) rbtrace (0.4.11) @@ -145,6 +146,7 @@ GEM msgpack (>= 0.4.3) optimist (>= 3.0.0) rdoc (4.3.0) + redis (4.1.2) rouge (3.7.0) rspec (3.8.0) rspec-core (~> 3.8.0) @@ -218,7 +220,7 @@ DEPENDENCIES github-linguist (~> 6.1) gitlab-gollum-lib (~> 4.2.7.7) gitlab-gollum-rugged_adapter (~> 0.4.4.2) - gitlab-labkit (~> 0.4.0) + gitlab-labkit (~> 0.5.0) gitlab-markup (~> 1.7.0) google-protobuf (~> 3.7.1) grpc (~> 1.19.0) |