diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-04-25 02:19:50 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-04-25 02:19:50 +0300 |
| commit | 0a558654ef411e6df8c988e89a55d4cc00d84c3c (patch) | |
| tree | 0f3a16c14ce26bf9b3374df51537d91b8ab2506b | |
| parent | da2d3ffa0cc76d12946f980575c61948fc03cbc5 (diff) | |
| parent | 066df14db8d5a0aac21d971d673c924e4425d5cd (diff) | |
Merge branch 'upgrade-activesupport-5-1' into 'master'
Upgrade ActiveSupport to 5.1.7
See merge request gitlab-org/gitaly!1211
| -rw-r--r-- | ruby/Gemfile | 2 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ruby/Gemfile b/ruby/Gemfile index e29bc050f..af7b07384 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -7,7 +7,7 @@ gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' gem 'gitaly-proto', '~> 1.22.0' -gem 'activesupport', '~> 5.0.2' +gem 'activesupport', '~> 5.1.7' gem 'rdoc', '~> 4.2' gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index 44f42ab3f..a5da36d03 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: abstract_type (0.0.7) - activesupport (5.0.7.2) + activesupport (5.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -20,7 +20,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.3) + concurrent-ruby (1.1.5) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.4) @@ -178,7 +178,7 @@ PLATFORMS ruby DEPENDENCIES - activesupport (~> 5.0.2) + activesupport (~> 5.1.7) bundler (>= 1.17.3) factory_bot faraday (~> 0.12) |