diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-07-12 15:34:43 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-07-12 15:34:43 +0300 |
| commit | bfa40a27fd3bf13aeb2bfd2c688bcdf32f59d33e (patch) | |
| tree | 2cadaf6c3de3d7622493f1a188cf4fcfc734ad6f | |
| parent | e1ac24c71b21dc6c4e7509e66e08a5719b2e47c1 (diff) | |
| parent | 18aeabec063fd72f76acdfd2dc1e8449aad39111 (diff) | |
Merge branch 'upgrade-activesupport-5-2' into 'master'
Upgrade ActiveSupport to 5.2.3
See merge request gitlab-org/gitaly!1342
| -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 1a6eb99b6..abe5b03df 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -6,7 +6,7 @@ gem 'bundler', '>= 1.17.3' gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' -gem 'activesupport', '~> 5.1.7' +gem 'activesupport', '~> 5.2.3' gem 'gitaly-proto', '~> 1.36.0' gem 'rdoc', '~> 4.2' gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 0a86273f7..23bce3cb8 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 (5.1.7) - actionview (= 5.1.7) - activesupport (= 5.1.7) + actionpack (5.2.3) + actionview (= 5.2.3) + activesupport (= 5.2.3) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.7) - activesupport (= 5.1.7) + actionview (5.2.3) + activesupport (= 5.2.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activesupport (5.1.7) + activesupport (5.2.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -213,7 +213,7 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 5.1.7) + activesupport (~> 5.2.3) bundler (>= 1.17.3) factory_bot faraday (~> 0.12) |