diff options
| author | Paul Okstad <pokstad@gitlab.com> | 2019-04-05 07:18:28 +0300 |
|---|---|---|
| committer | Paul Okstad <pokstad@gitlab.com> | 2019-04-05 07:18:28 +0300 |
| commit | fb3b8ed6e8288e42b4c396480739cb8a515592fb (patch) | |
| tree | 904c503c029dda0a4d021c3cb9cb31d534b55b58 | |
| parent | d46f3d9d807f2618023944ac01693788fa95a729 (diff) | |
| parent | 6432df299692485a30ae9069d66488ef7230d877 (diff) | |
Merge branch 'sh-bump-activesupport' into 'master'
Bump activesupport to 5.0.2.1
See merge request gitlab-org/gitaly!1185
| -rw-r--r-- | changelogs/unreleased/sh-bump-activesupport.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/sh-bump-activesupport.yml b/changelogs/unreleased/sh-bump-activesupport.yml new file mode 100644 index 000000000..09902acd5 --- /dev/null +++ b/changelogs/unreleased/sh-bump-activesupport.yml @@ -0,0 +1,5 @@ +--- +title: Bump activesupport to 5.0.2.1 +merge_request: 1185 +author: +type: security diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index c71cc8970..2e9e35837 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) + activesupport (5.0.7.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -70,7 +70,7 @@ GEM google-protobuf (~> 3.1) googleapis-common-protos-types (~> 1.0.0) hashdiff (0.3.8) - i18n (1.1.1) + i18n (1.6.0) concurrent-ruby (~> 1.0) ice_nine (0.11.2) json (2.2.0) |