From 4cffd33a96da706fb36ab8dbf37732749ca27cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Fri, 26 Feb 2016 16:19:44 -0300 Subject: [PATCH] Preparing for 4.1.14.2 release --- Gemfile.lock | 54 +++++++++---------- RAILS_VERSION | 2 +- actionmailer/CHANGELOG.md | 10 ++++ actionmailer/lib/action_mailer/gem_version.rb | 2 +- actionpack/CHANGELOG.md | 14 +++++ actionpack/lib/action_pack/gem_version.rb | 2 +- actionview/CHANGELOG.md | 16 ++++++ actionview/lib/action_view/gem_version.rb | 2 +- activemodel/CHANGELOG.md | 10 ++++ activemodel/lib/active_model/gem_version.rb | 2 +- activerecord/CHANGELOG.md | 10 ++++ activerecord/lib/active_record/gem_version.rb | 2 +- activesupport/CHANGELOG.md | 10 ++++ .../lib/active_support/gem_version.rb | 2 +- guides/CHANGELOG.md | 10 ++++ railties/CHANGELOG.md | 10 ++++ railties/lib/rails/gem_version.rb | 2 +- version.rb | 2 +- 18 files changed, 126 insertions(+), 36 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index bbfad8063ba..d2e6bd7d9f0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,45 +1,45 @@ PATH remote: . specs: - actionmailer (4.1.14.1) - actionpack (= 4.1.14.1) - actionview (= 4.1.14.1) + actionmailer (4.1.14.2) + actionpack (= 4.1.14.2) + actionview (= 4.1.14.2) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.14.1) - actionview (= 4.1.14.1) - activesupport (= 4.1.14.1) + actionpack (4.1.14.2) + actionview (= 4.1.14.2) + activesupport (= 4.1.14.2) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.14.1) - activesupport (= 4.1.14.1) + actionview (4.1.14.2) + activesupport (= 4.1.14.2) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.14.1) - activesupport (= 4.1.14.1) + activemodel (4.1.14.2) + activesupport (= 4.1.14.2) builder (~> 3.1) - activerecord (4.1.14.1) - activemodel (= 4.1.14.1) - activesupport (= 4.1.14.1) + activerecord (4.1.14.2) + activemodel (= 4.1.14.2) + activesupport (= 4.1.14.2) arel (~> 5.0.0) - activesupport (4.1.14.1) + activesupport (4.1.14.2) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) - rails (4.1.14.1) - actionmailer (= 4.1.14.1) - actionpack (= 4.1.14.1) - actionview (= 4.1.14.1) - activemodel (= 4.1.14.1) - activerecord (= 4.1.14.1) - activesupport (= 4.1.14.1) + rails (4.1.14.2) + actionmailer (= 4.1.14.2) + actionpack (= 4.1.14.2) + actionview (= 4.1.14.2) + activemodel (= 4.1.14.2) + activerecord (= 4.1.14.2) + activesupport (= 4.1.14.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.14.1) + railties (= 4.1.14.2) sprockets-rails (~> 2.0) - railties (4.1.14.1) - actionpack (= 4.1.14.1) - activesupport (= 4.1.14.1) + railties (4.1.14.2) + actionpack (= 4.1.14.2) + activesupport (= 4.1.14.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) @@ -72,7 +72,7 @@ GEM mime-types (>= 1.16, < 3) metaclass (0.0.4) mime-types (2.6.2) - mini_portile (0.6.2) + mini_portile2 (2.0.0) minitest (5.3.3) mocha (0.14.0) metaclass (~> 0.0.1) @@ -151,4 +151,4 @@ DEPENDENCIES w3c_validators BUNDLED WITH - 1.10.6 + 1.11.2 diff --git a/RAILS_VERSION b/RAILS_VERSION index b7076c229a5..2060b4e47f8 100644 --- a/RAILS_VERSION +++ b/RAILS_VERSION @@ -1 +1 @@ -4.1.14.1 +4.1.14.2 diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 54c0ec8a204..6fa4cb8f575 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,13 @@ +## Rails 4.1.14.2 (February 26, 2016) ## + +* No changes. + + +## Rails 4.1.14.1 (January 25, 2015) ## + +* No changes. + + ## Rails 4.1.14 (November 12, 2015) ## * No changes. diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb index b5fb0e68edd..200eea966a1 100644 --- a/actionmailer/lib/action_mailer/gem_version.rb +++ b/actionmailer/lib/action_mailer/gem_version.rb @@ -8,7 +8,7 @@ module ActionMailer MAJOR = 4 MINOR = 1 TINY = 14 - PRE = "1" + PRE = "2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 47f418669c3..3de953e603d 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,3 +1,17 @@ +## Rails 4.1.14.2 (February 26, 2016) ## + +* Do not allow render with unpermitted parameter. + + Fixes CVE-2016-2098. + + *Arthur Neves* + + +## Rails 4.1.14.1 (January 25, 2015) ## + +* No changes. + + ## Rails 4.1.14 (November 12, 2015) ## * No changes. diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb index b0dcd7bfe8f..9a8725d14e8 100644 --- a/actionpack/lib/action_pack/gem_version.rb +++ b/actionpack/lib/action_pack/gem_version.rb @@ -8,7 +8,7 @@ module ActionPack MAJOR = 4 MINOR = 1 TINY = 14 - PRE = "1" + PRE = "2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index 05bda0d6ec4..3ba52d57993 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,12 @@ +## Rails 4.1.14.2 (February 26, 2016) ## + +* Do not allow render with unpermitted parameter. + + Fixes CVE-2016-2098. + + *Arthur Neves* + + * Changed the meaning of `render "foo/bar"`. Previously, calling `render "foo/bar"` in a controller action is equivalent @@ -5,9 +14,16 @@ `render template: "foo/bar"` instead. If you need to render a file, please change your code to use the explicit form (`render file: "foo/bar"`) instead. + Fixes CVE-2016-2097. + *Eileen Uchitelle* +## Rails 4.2.5.1 (January 25, 2015) ## + +* No changes. + + ## Rails 4.1.14 (November 12, 2015) ## * Fix `mail_to` when called with `nil` as argument. diff --git a/actionview/lib/action_view/gem_version.rb b/actionview/lib/action_view/gem_version.rb index a56b639c66a..4dab78fb920 100644 --- a/actionview/lib/action_view/gem_version.rb +++ b/actionview/lib/action_view/gem_version.rb @@ -8,7 +8,7 @@ module ActionView MAJOR = 4 MINOR = 1 TINY = 14 - PRE = "1" + PRE = "2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index a83d920ee32..f0a1f59deb8 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,3 +1,13 @@ +## Rails 4.1.14.2 (February 26, 2016) ## + +* No changes. + + +## Rails 4.1.14.1 (January 25, 2015) ## + +* No changes. + + ## Rails 4.1.14 (November 12, 2015) ## * No changes. diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb index 1b795843845..ccccf1101a5 100644 --- a/activemodel/lib/active_model/gem_version.rb +++ b/activemodel/lib/active_model/gem_version.rb @@ -8,7 +8,7 @@ module ActiveModel MAJOR = 4 MINOR = 1 TINY = 14 - PRE = "1" + PRE = "2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 269133a85d2..bc0a9b219ee 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,13 @@ +## Rails 4.1.14.2 (February 26, 2016) ## + +* No changes. + + +## Rails 4.1.14.1 (January 25, 2015) ## + +* No changes. + + ## Rails 4.1.14 (November 12, 2015) ## * No longer pass deprecated option `-i` to `pg_dump`. diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb index 238c8c30273..92a38763b7e 100644 --- a/activerecord/lib/active_record/gem_version.rb +++ b/activerecord/lib/active_record/gem_version.rb @@ -8,7 +8,7 @@ module ActiveRecord MAJOR = 4 MINOR = 1 TINY = 14 - PRE = "1" + PRE = "2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 8fd4d419c0a..a2ce6de990f 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,3 +1,13 @@ +## Rails 4.1.14.2 (February 26, 2016) ## + +* No changes. + + +## Rails 4.1.14.1 (January 25, 2015) ## + +* No changes. + + ## Rails 4.1.14 (November 12, 2015) ## * No changes. diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb index 5900d056b39..ba8f1b71c56 100644 --- a/activesupport/lib/active_support/gem_version.rb +++ b/activesupport/lib/active_support/gem_version.rb @@ -8,7 +8,7 @@ module ActiveSupport MAJOR = 4 MINOR = 1 TINY = 14 - PRE = "1" + PRE = "2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md index 919e17c6605..fa8e41e50a6 100644 --- a/guides/CHANGELOG.md +++ b/guides/CHANGELOG.md @@ -1,3 +1,13 @@ +## Rails 4.1.14.2 (February 26, 2016) ## + +* No changes. + + +## Rails 4.1.14.1 (January 25, 2015) ## + +* No changes. + + ## Rails 4.1.14 (November 12, 2015) ## * No changes. diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 28a97b5167e..955d9055b3c 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,13 @@ +## Rails 4.1.14.2 (February 26, 2016) ## + +* No changes. + + +## Rails 4.1.14.1 (January 25, 2015) ## + +* No changes. + + ## Rails 4.1.14 (November 12, 2015) ## * No changes. diff --git a/railties/lib/rails/gem_version.rb b/railties/lib/rails/gem_version.rb index b2a3e728cad..45b98e27e54 100644 --- a/railties/lib/rails/gem_version.rb +++ b/railties/lib/rails/gem_version.rb @@ -8,7 +8,7 @@ module Rails MAJOR = 4 MINOR = 1 TINY = 14 - PRE = "1" + PRE = "2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end diff --git a/version.rb b/version.rb index b2a3e728cad..45b98e27e54 100644 --- a/version.rb +++ b/version.rb @@ -8,7 +8,7 @@ module Rails MAJOR = 4 MINOR = 1 TINY = 14 - PRE = "1" + PRE = "2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end