Commit 599d9499 authored by Robert Speicher's avatar Robert Speicher

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
parents 26fc6a49 207c7c8c
...@@ -5,7 +5,7 @@ end ...@@ -5,7 +5,7 @@ end
gem_versions = {} gem_versions = {}
gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' 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' gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9'
# The 2.0.6 version of rack requires monkeypatch to be present in # The 2.0.6 version of rack requires monkeypatch to be present in
......
...@@ -619,16 +619,16 @@ GEM ...@@ -619,16 +619,16 @@ GEM
rack rack
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.10) rails (4.2.11)
actionmailer (= 4.2.10) actionmailer (= 4.2.11)
actionpack (= 4.2.10) actionpack (= 4.2.11)
actionview (= 4.2.10) actionview (= 4.2.11)
activejob (= 4.2.10) activejob (= 4.2.11)
activemodel (= 4.2.10) activemodel (= 4.2.11)
activerecord (= 4.2.10) activerecord (= 4.2.11)
activesupport (= 4.2.10) activesupport (= 4.2.11)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.2.10) railties (= 4.2.11)
sprockets-rails sprockets-rails
rails-deprecated_sanitizer (1.0.3) rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha) activesupport (>= 4.2.0.alpha)
...@@ -1086,7 +1086,7 @@ DEPENDENCIES ...@@ -1086,7 +1086,7 @@ DEPENDENCIES
rack-cors (~> 1.0.0) rack-cors (~> 1.0.0)
rack-oauth2 (~> 1.2.1) rack-oauth2 (~> 1.2.1)
rack-proxy (~> 0.6.0) rack-proxy (~> 0.6.0)
rails (= 4.2.10) rails (= 4.2.11)
rails-deprecated_sanitizer (~> 1.0.3) rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 4.0.9) rails-i18n (~> 4.0.9)
rainbow (~> 3.0) rainbow (~> 3.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment