diff options
| author | Stan Hu <stanhu@gmail.com> | 2020-05-16 17:45:29 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2020-05-18 20:32:09 +0300 |
| commit | 038dc53c9a6a6af8458bd7e92a57ed42c06b5da9 (patch) | |
| tree | 48e85b395715a1a10052dba97a0bb78291b7c9d5 | |
| parent | 9ac3d3e6dccbb33fd3c7fa18461022741f3f470e (diff) | |
Update activesupport to v6.0.3 and gitlab-labkit to v0.12.0
We upgraded to Rails 6.0.3 in
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31307, so update
the gitaly-ruby gems to match in order to save some space.
| -rw-r--r-- | changelogs/unreleased/sh-bump-activesupport-6-0-3.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 4 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 24 |
3 files changed, 19 insertions, 14 deletions
diff --git a/changelogs/unreleased/sh-bump-activesupport-6-0-3.yml b/changelogs/unreleased/sh-bump-activesupport-6-0-3.yml new file mode 100644 index 000000000..8bc379ab6 --- /dev/null +++ b/changelogs/unreleased/sh-bump-activesupport-6-0-3.yml @@ -0,0 +1,5 @@ +--- +title: Update activesupport to v6.0.3 and gitlab-labkit to v0.12.0 +merge_request: 2178 +author: +type: other diff --git a/ruby/Gemfile b/ruby/Gemfile index 785c51568..57d3f1cbe 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -6,7 +6,7 @@ gem 'bundler', '>= 1.17.3' gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 7.9', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' -gem 'activesupport', '~> 6.0.2.2' +gem 'activesupport', '~> 6.0.3' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false @@ -16,7 +16,7 @@ gem 'faraday', '~> 0.12' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.9.1' +gem 'gitlab-labkit', '~> 0.12.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 9b0fd37cb..fcedaa6c3 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -2,25 +2,25 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.0.2.2) - actionview (= 6.0.2.2) - activesupport (= 6.0.2.2) + actionpack (6.0.3) + actionview (= 6.0.3) + activesupport (= 6.0.3) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (6.0.2.2) - activesupport (= 6.0.2.2) + actionview (6.0.3) + activesupport (= 6.0.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.0.2.2) + activesupport (6.0.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.2) + zeitwerk (~> 2.2, >= 2.2.2) adamantium (0.2.0) ice_nine (~> 0.11.0) memoizable (~> 0.4.0) @@ -67,7 +67,7 @@ GEM gitlab-gollum-rugged_adapter (0.4.4.2) mime-types (>= 1.15) rugged (~> 0.25) - gitlab-labkit (0.9.1) + gitlab-labkit (0.12.0) actionpack (>= 5.0.0, < 6.1.0) activesupport (>= 5.0.0, < 6.1.0) grpc (~> 1.19) @@ -94,7 +94,7 @@ GEM licensee (8.9.2) rugged (~> 0.24) listen (0.5.3) - loofah (2.4.0) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) memoizable (0.4.2) @@ -186,7 +186,7 @@ GEM thread_safe (0.3.6) thrift (0.11.0.0) timecop (0.9.1) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) unicode-display_width (1.6.0) unparser (0.4.7) @@ -208,14 +208,14 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.0.2.2) + activesupport (~> 6.0.3) bundler (>= 1.17.3) factory_bot faraday (~> 0.12) github-linguist (~> 7.9) gitlab-gollum-lib (~> 4.2.7.9) gitlab-gollum-rugged_adapter (~> 0.4.4.2) - gitlab-labkit (~> 0.9.1) + gitlab-labkit (~> 0.12.0) gitlab-markup (~> 1.7.1) google-protobuf (~> 3.8.0) grpc (~> 1.24.0) |