Merge branch 'sh-update-rails-5.0.7.2' into 'master'
Update Rails to 5.0.7.2 Closes #58963 See merge request gitlab-org/gitlab-ce!27022
This commit is contained in:
commit
0b7f904635
2
Gemfile
2
Gemfile
|
@ -1,6 +1,6 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '5.0.7.1'
|
gem 'rails', '5.0.7.2'
|
||||||
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
|
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
|
||||||
|
|
||||||
# Improves copy-on-write performance for MRI
|
# Improves copy-on-write performance for MRI
|
||||||
|
|
70
Gemfile.lock
70
Gemfile.lock
|
@ -4,41 +4,41 @@ GEM
|
||||||
RedCloth (4.3.2)
|
RedCloth (4.3.2)
|
||||||
abstract_type (0.0.7)
|
abstract_type (0.0.7)
|
||||||
ace-rails-ap (4.1.2)
|
ace-rails-ap (4.1.2)
|
||||||
actioncable (5.0.7.1)
|
actioncable (5.0.7.2)
|
||||||
actionpack (= 5.0.7.1)
|
actionpack (= 5.0.7.2)
|
||||||
nio4r (>= 1.2, < 3.0)
|
nio4r (>= 1.2, < 3.0)
|
||||||
websocket-driver (~> 0.6.1)
|
websocket-driver (~> 0.6.1)
|
||||||
actionmailer (5.0.7.1)
|
actionmailer (5.0.7.2)
|
||||||
actionpack (= 5.0.7.1)
|
actionpack (= 5.0.7.2)
|
||||||
actionview (= 5.0.7.1)
|
actionview (= 5.0.7.2)
|
||||||
activejob (= 5.0.7.1)
|
activejob (= 5.0.7.2)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (5.0.7.1)
|
actionpack (5.0.7.2)
|
||||||
actionview (= 5.0.7.1)
|
actionview (= 5.0.7.2)
|
||||||
activesupport (= 5.0.7.1)
|
activesupport (= 5.0.7.2)
|
||||||
rack (~> 2.0)
|
rack (~> 2.0)
|
||||||
rack-test (~> 0.6.3)
|
rack-test (~> 0.6.3)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (5.0.7.1)
|
actionview (5.0.7.2)
|
||||||
activesupport (= 5.0.7.1)
|
activesupport (= 5.0.7.2)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||||
activejob (5.0.7.1)
|
activejob (5.0.7.2)
|
||||||
activesupport (= 5.0.7.1)
|
activesupport (= 5.0.7.2)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (5.0.7.1)
|
activemodel (5.0.7.2)
|
||||||
activesupport (= 5.0.7.1)
|
activesupport (= 5.0.7.2)
|
||||||
activerecord (5.0.7.1)
|
activerecord (5.0.7.2)
|
||||||
activemodel (= 5.0.7.1)
|
activemodel (= 5.0.7.2)
|
||||||
activesupport (= 5.0.7.1)
|
activesupport (= 5.0.7.2)
|
||||||
arel (~> 7.0)
|
arel (~> 7.0)
|
||||||
activerecord_sane_schema_dumper (1.0)
|
activerecord_sane_schema_dumper (1.0)
|
||||||
rails (>= 5, < 6)
|
rails (>= 5, < 6)
|
||||||
activesupport (5.0.7.1)
|
activesupport (5.0.7.2)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (>= 0.7, < 2)
|
i18n (>= 0.7, < 2)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
|
@ -298,7 +298,7 @@ GEM
|
||||||
omniauth (~> 1.3)
|
omniauth (~> 1.3)
|
||||||
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
|
pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
|
||||||
rubyntlm (~> 0.5)
|
rubyntlm (~> 0.5)
|
||||||
globalid (0.4.1)
|
globalid (0.4.2)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
gon (6.2.0)
|
gon (6.2.0)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
|
@ -385,7 +385,7 @@ GEM
|
||||||
mime-types (~> 3.0)
|
mime-types (~> 3.0)
|
||||||
multi_xml (>= 0.5.2)
|
multi_xml (>= 0.5.2)
|
||||||
httpclient (2.8.3)
|
httpclient (2.8.3)
|
||||||
i18n (1.2.0)
|
i18n (1.6.0)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
icalendar (2.4.1)
|
icalendar (2.4.1)
|
||||||
ice_nine (0.11.2)
|
ice_nine (0.11.2)
|
||||||
|
@ -635,17 +635,17 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (5.0.7.1)
|
rails (5.0.7.2)
|
||||||
actioncable (= 5.0.7.1)
|
actioncable (= 5.0.7.2)
|
||||||
actionmailer (= 5.0.7.1)
|
actionmailer (= 5.0.7.2)
|
||||||
actionpack (= 5.0.7.1)
|
actionpack (= 5.0.7.2)
|
||||||
actionview (= 5.0.7.1)
|
actionview (= 5.0.7.2)
|
||||||
activejob (= 5.0.7.1)
|
activejob (= 5.0.7.2)
|
||||||
activemodel (= 5.0.7.1)
|
activemodel (= 5.0.7.2)
|
||||||
activerecord (= 5.0.7.1)
|
activerecord (= 5.0.7.2)
|
||||||
activesupport (= 5.0.7.1)
|
activesupport (= 5.0.7.2)
|
||||||
bundler (>= 1.3.0)
|
bundler (>= 1.3.0)
|
||||||
railties (= 5.0.7.1)
|
railties (= 5.0.7.2)
|
||||||
sprockets-rails (>= 2.0.0)
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-controller-testing (1.0.2)
|
rails-controller-testing (1.0.2)
|
||||||
actionpack (~> 5.x, >= 5.0.1)
|
actionpack (~> 5.x, >= 5.0.1)
|
||||||
|
@ -661,9 +661,9 @@ GEM
|
||||||
rails-i18n (5.1.1)
|
rails-i18n (5.1.1)
|
||||||
i18n (>= 0.7, < 2)
|
i18n (>= 0.7, < 2)
|
||||||
railties (>= 5.0, < 6)
|
railties (>= 5.0, < 6)
|
||||||
railties (5.0.7.1)
|
railties (5.0.7.2)
|
||||||
actionpack (= 5.0.7.1)
|
actionpack (= 5.0.7.2)
|
||||||
activesupport (= 5.0.7.1)
|
activesupport (= 5.0.7.2)
|
||||||
method_source
|
method_source
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
|
@ -1105,7 +1105,7 @@ DEPENDENCIES
|
||||||
rack-cors (~> 1.0.0)
|
rack-cors (~> 1.0.0)
|
||||||
rack-oauth2 (~> 1.9.3)
|
rack-oauth2 (~> 1.9.3)
|
||||||
rack-proxy (~> 0.6.0)
|
rack-proxy (~> 0.6.0)
|
||||||
rails (= 5.0.7.1)
|
rails (= 5.0.7.2)
|
||||||
rails-controller-testing
|
rails-controller-testing
|
||||||
rails-deprecated_sanitizer (~> 1.0.3)
|
rails-deprecated_sanitizer (~> 1.0.3)
|
||||||
rails-i18n (~> 5.1)
|
rails-i18n (~> 5.1)
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Update Rails to 5.0.7.2
|
||||||
|
merge_request: 27022
|
||||||
|
author:
|
||||||
|
type: security
|
Loading…
Reference in New Issue