summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor Shea <connor.james.shea@gmail.com>2017-06-26 16:11:48 -0600
committerConnor Shea <connor.james.shea@gmail.com>2017-06-27 15:09:30 -0600
commit0a7bd3278c2fd07a5d3e4e4c5286122dcc4e90ae (patch)
tree638fa68a6dbf7254e1890093fa11330f3f40787a
parenta3f2f6006f934be90e441efdae0c3aa9132b7c90 (diff)
downloadgitlab-ce-cs-upgrade-rails-4-2-9.tar.gz
Update Rails from 4.2.8 to 4.2.9.cs-upgrade-rails-4-2-9
This is a bug fix release and the last 4.2.x release for Rails. http://weblog.rubyonrails.org/2017/6/26/Rails-4-2-9-has-been-released/
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock72
-rw-r--r--changelogs/unreleased/cs-upgrade-rails-4-2-9.yml4
3 files changed, 41 insertions, 37 deletions
diff --git a/Gemfile b/Gemfile
index 71d2eb1557c..d95c7db674a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '4.2.8'
+gem 'rails', '4.2.9'
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
gem 'bootsnap', '~> 1.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index f4ddd30da1b..f8bc8157097 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,38 +3,38 @@ GEM
specs:
RedCloth (4.3.2)
ace-rails-ap (4.1.2)
- actionmailer (4.2.8)
- actionpack (= 4.2.8)
- actionview (= 4.2.8)
- activejob (= 4.2.8)
+ actionmailer (4.2.9)
+ actionpack (= 4.2.9)
+ actionview (= 4.2.9)
+ activejob (= 4.2.9)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
- actionpack (4.2.8)
- actionview (= 4.2.8)
- activesupport (= 4.2.8)
+ actionpack (4.2.9)
+ actionview (= 4.2.9)
+ activesupport (= 4.2.9)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
- actionview (4.2.8)
- activesupport (= 4.2.8)
+ actionview (4.2.9)
+ activesupport (= 4.2.9)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
- activejob (4.2.8)
- activesupport (= 4.2.8)
+ activejob (4.2.9)
+ activesupport (= 4.2.9)
globalid (>= 0.3.0)
- activemodel (4.2.8)
- activesupport (= 4.2.8)
+ activemodel (4.2.9)
+ activesupport (= 4.2.9)
builder (~> 3.1)
- activerecord (4.2.8)
- activemodel (= 4.2.8)
- activesupport (= 4.2.8)
+ activerecord (4.2.9)
+ activemodel (= 4.2.9)
+ activesupport (= 4.2.9)
arel (~> 6.0)
activerecord_sane_schema_dumper (0.2)
rails (>= 4, < 5)
- activesupport (4.2.8)
+ activesupport (4.2.9)
i18n (~> 0.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
@@ -302,8 +302,8 @@ GEM
omniauth (~> 1.0)
pyu-ruby-sasl (~> 0.0.3.1)
rubyntlm (~> 0.3)
- globalid (0.3.7)
- activesupport (>= 4.1.0)
+ globalid (0.4.0)
+ activesupport (>= 4.2.0)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
gollum-lib (4.2.1)
@@ -396,7 +396,7 @@ GEM
json (~> 1.8)
multi_xml (>= 0.5.2)
httpclient (2.8.2)
- i18n (0.8.1)
+ i18n (0.8.4)
ice_nine (0.11.2)
influxdb (0.2.3)
cause
@@ -454,7 +454,7 @@ GEM
multi_json (~> 1.10)
loofah (2.0.3)
nokogiri (>= 1.5.9)
- mail (2.6.5)
+ mail (2.6.6)
mime-types (>= 1.16, < 4)
mail_room (0.9.1)
memoist (0.15.0)
@@ -611,7 +611,7 @@ GEM
pry-rails (0.3.5)
pry (>= 0.9.10)
pyu-ruby-sasl (0.0.3.3)
- rack (1.6.5)
+ rack (1.6.8)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (4.4.1)
@@ -629,16 +629,16 @@ GEM
rack
rack-test (0.6.3)
rack (>= 1.0)
- rails (4.2.8)
- actionmailer (= 4.2.8)
- actionpack (= 4.2.8)
- actionview (= 4.2.8)
- activejob (= 4.2.8)
- activemodel (= 4.2.8)
- activerecord (= 4.2.8)
- activesupport (= 4.2.8)
+ rails (4.2.9)
+ actionmailer (= 4.2.9)
+ actionpack (= 4.2.9)
+ actionview (= 4.2.9)
+ activejob (= 4.2.9)
+ activemodel (= 4.2.9)
+ activerecord (= 4.2.9)
+ activesupport (= 4.2.9)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.2.8)
+ railties (= 4.2.9)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@@ -651,9 +651,9 @@ GEM
rails-i18n (4.0.9)
i18n (~> 0.7)
railties (~> 4.0)
- railties (4.2.8)
- actionpack (= 4.2.8)
- activesupport (= 4.2.8)
+ railties (4.2.9)
+ actionpack (= 4.2.9)
+ activesupport (= 4.2.9)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.2)
@@ -860,7 +860,7 @@ GEM
truncato (0.7.8)
htmlentities (~> 4.3.1)
nokogiri (~> 1.6.1)
- tzinfo (1.2.2)
+ tzinfo (1.2.3)
thread_safe (~> 0.1)
u2f (0.2.1)
uglifier (2.7.2)
@@ -1058,7 +1058,7 @@ DEPENDENCIES
rack-cors (~> 0.4.0)
rack-oauth2 (~> 1.2.1)
rack-proxy (~> 0.6.0)
- rails (= 4.2.8)
+ rails (= 4.2.9)
rails-deprecated_sanitizer (~> 1.0.3)
rails-i18n (~> 4.0.9)
rainbow (~> 2.2)
diff --git a/changelogs/unreleased/cs-upgrade-rails-4-2-9.yml b/changelogs/unreleased/cs-upgrade-rails-4-2-9.yml
new file mode 100644
index 00000000000..9cf5938904d
--- /dev/null
+++ b/changelogs/unreleased/cs-upgrade-rails-4-2-9.yml
@@ -0,0 +1,4 @@
+---
+title: Update Rails from 4.2.8 to 4.2.9.
+merge_request: 12469
+author: Connor Shea