diff options
| author | Stan Hu <stanhu@gmail.com> | 2020-04-25 23:18:09 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2020-04-25 23:19:30 +0300 |
| commit | c1a9440eba22569068be048672e80e2a0cf00022 (patch) | |
| tree | 8cff9428ee082d0b7a33a20d16cbfed51f20fa54 | |
| parent | 2efe25ce64103ecd68c21fa030415ae242102e19 (diff) | |
Upgrade activesupport and related Ruby gems to v6.0.2.2
This mirrors the change shipped in
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29743 and saves a
little disk space.
| -rw-r--r-- | changelogs/unreleased/sh-bump-activesupport.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 20 |
3 files changed, 16 insertions, 11 deletions
diff --git a/changelogs/unreleased/sh-bump-activesupport.yml b/changelogs/unreleased/sh-bump-activesupport.yml new file mode 100644 index 000000000..f6595bce9 --- /dev/null +++ b/changelogs/unreleased/sh-bump-activesupport.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade activesupport and related Ruby gems to v6.0.2.2 +merge_request: 2110 +author: +type: other diff --git a/ruby/Gemfile b/ruby/Gemfile index d9a60e073..d8fdbb706 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -6,7 +6,7 @@ gem 'bundler', '>= 1.17.3' gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 7.5', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' -gem 'activesupport', '6.0.2' +gem 'activesupport', '~> 6.0.2.2' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.8', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index c5fb5dff5..d4b852483 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -2,20 +2,20 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - actionpack (6.0.2) - actionview (= 6.0.2) - activesupport (= 6.0.2) - rack (~> 2.0) + actionpack (6.0.2.2) + actionview (= 6.0.2.2) + activesupport (= 6.0.2.2) + 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) - activesupport (= 6.0.2) + actionview (6.0.2.2) + activesupport (= 6.0.2.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.0.2) + activesupport (6.0.2.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -34,7 +34,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.6) @@ -201,13 +201,13 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - zeitwerk (2.2.2) + zeitwerk (2.3.0) PLATFORMS ruby DEPENDENCIES - activesupport (= 6.0.2) + activesupport (~> 6.0.2.2) bundler (>= 1.17.3) factory_bot faraday (~> 0.12) |