diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2018-12-07 00:57:51 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-12-07 00:57:51 +0300 |
| commit | 599d94993699d04d07738bede17dbd93282c4edd (patch) | |
| tree | 6dbafdd16a79a7bd1376f727e7148f6e3fa5bbde | |
| parent | 26fc6a4958c012b3f6c15cc01a6684e87d381488 (diff) | |
| parent | 207c7c8cc7e28c3ea474bd10142a4c60483b85e9 (diff) | |
Merge branch 'fix-gemfile-rails-security-update' into 'master'
Security update of gem rails to version 4.2.11
See merge request gitlab-org/gitlab-ce!23520
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.rails4.lock | 20 |
2 files changed, 11 insertions, 11 deletions
@@ -5,7 +5,7 @@ end gem_versions = {} gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' -gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.10' +gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.11' gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' # The 2.0.6 version of rack requires monkeypatch to be present in diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock index ad10511c366..9e7bae84299 100644 --- a/Gemfile.rails4.lock +++ b/Gemfile.rails4.lock @@ -619,16 +619,16 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.10) - actionmailer (= 4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) - activemodel (= 4.2.10) - activerecord (= 4.2.10) - activesupport (= 4.2.10) + rails (4.2.11) + actionmailer (= 4.2.11) + actionpack (= 4.2.11) + actionview (= 4.2.11) + activejob (= 4.2.11) + activemodel (= 4.2.11) + activerecord (= 4.2.11) + activesupport (= 4.2.11) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.10) + railties (= 4.2.11) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -1086,7 +1086,7 @@ DEPENDENCIES rack-cors (~> 1.0.0) rack-oauth2 (~> 1.2.1) rack-proxy (~> 0.6.0) - rails (= 4.2.10) + rails (= 4.2.11) rails-deprecated_sanitizer (~> 1.0.3) rails-i18n (~> 4.0.9) rainbow (~> 3.0) |