summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2018-12-06 21:57:51 +0000
committerRobert Speicher <rspeicher@gmail.com>2018-12-06 21:57:51 +0000
commit599d94993699d04d07738bede17dbd93282c4edd (patch)
tree6dbafdd16a79a7bd1376f727e7148f6e3fa5bbde /Gemfile
parent26fc6a4958c012b3f6c15cc01a6684e87d381488 (diff)
parent207c7c8cc7e28c3ea474bd10142a4c60483b85e9 (diff)
downloadgitlab-ce-599d94993699d04d07738bede17dbd93282c4edd.tar.gz
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
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index cd2e5df3255..93c2052f15f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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