diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-05-19 16:30:03 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-05-19 16:30:03 +0300 |
| commit | 1e9db85af70799ff697df32d1ed4ea3ef5764378 (patch) | |
| tree | 8752023493136c9a3583461984a0a73e8b028fef | |
| parent | b394ac11e93e3ac867a034b08481f20ca6ba9333 (diff) | |
| parent | 9a2354f746f807ded98e68e1d6f1791a96a890bc (diff) | |
Merge branch 'upgrade-activesupport-6-0-3' into 'master'
Update gems to match those in the Rails repo
See merge request gitlab-org/gitaly!2144
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index 57d3f1cbe..8a35c8c3b 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.3' +gem 'activesupport', '~> 6.0.3.1' 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 diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index fcedaa6c3..da07cf259 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.3) - actionview (= 6.0.3) - activesupport (= 6.0.3) + actionpack (6.0.3.1) + actionview (= 6.0.3.1) + activesupport (= 6.0.3.1) 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.3) - activesupport (= 6.0.3) + actionview (6.0.3.1) + activesupport (= 6.0.3.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activesupport (6.0.3) + activesupport (6.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -208,7 +208,7 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 6.0.3) + activesupport (~> 6.0.3.1) bundler (>= 1.17.3) factory_bot faraday (~> 0.12) |