Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Preparing for 4.2.2 release
  • Loading branch information
rafaelfranca committed Jun 16, 2015
1 parent 78b29e0 commit 5d101c3
Show file tree
Hide file tree
Showing 20 changed files with 103 additions and 49 deletions.
77 changes: 38 additions & 39 deletions Gemfile.lock
Expand Up @@ -14,55 +14,55 @@ GIT
PATH
remote: .
specs:
actionmailer (4.2.1.rc1)
actionpack (= 4.2.1.rc1)
actionview (= 4.2.1.rc1)
activejob (= 4.2.1.rc1)
actionmailer (4.2.2)
actionpack (= 4.2.2)
actionview (= 4.2.2)
activejob (= 4.2.2)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.1.rc1)
actionview (= 4.2.1.rc1)
activesupport (= 4.2.1.rc1)
actionpack (4.2.2)
actionview (= 4.2.2)
activesupport (= 4.2.2)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
actionview (4.2.1.rc1)
activesupport (= 4.2.1.rc1)
actionview (4.2.2)
activesupport (= 4.2.2)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1)
activejob (4.2.1.rc1)
activesupport (= 4.2.1.rc1)
activejob (4.2.2)
activesupport (= 4.2.2)
globalid (>= 0.3.0)
activemodel (4.2.1.rc1)
activesupport (= 4.2.1.rc1)
activemodel (4.2.2)
activesupport (= 4.2.2)
builder (~> 3.1)
activerecord (4.2.1.rc1)
activemodel (= 4.2.1.rc1)
activesupport (= 4.2.1.rc1)
activerecord (4.2.2)
activemodel (= 4.2.2)
activesupport (= 4.2.2)
arel (~> 6.0)
activesupport (4.2.1.rc1)
activesupport (4.2.2)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
rails (4.2.1.rc1)
actionmailer (= 4.2.1.rc1)
actionpack (= 4.2.1.rc1)
actionview (= 4.2.1.rc1)
activejob (= 4.2.1.rc1)
activemodel (= 4.2.1.rc1)
activerecord (= 4.2.1.rc1)
activesupport (= 4.2.1.rc1)
rails (4.2.2)
actionmailer (= 4.2.2)
actionpack (= 4.2.2)
actionview (= 4.2.2)
activejob (= 4.2.2)
activemodel (= 4.2.2)
activerecord (= 4.2.2)
activesupport (= 4.2.2)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.1.rc1)
railties (= 4.2.2)
sprockets-rails
railties (4.2.1.rc1)
actionpack (= 4.2.1.rc1)
activesupport (= 4.2.1.rc1)
railties (4.2.2)
actionpack (= 4.2.2)
activesupport (= 4.2.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)

Expand Down Expand Up @@ -99,9 +99,8 @@ GEM
delayed_job (>= 3.0, < 4.1)
erubis (2.7.0)
execjs (2.3.0)
globalid (0.3.3)
globalid (0.3.5)
activesupport (>= 4.1.0)
hike (1.2.3)
hitimes (1.2.2)
i18n (0.7.0)
jquery-rails (4.0.3)
Expand All @@ -112,12 +111,12 @@ GEM
kindlerb (0.1.1)
mustache
nokogiri
loofah (2.0.1)
loofah (2.0.2)
nokogiri (>= 1.5.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
metaclass (0.0.4)
mime-types (2.4.3)
mime-types (2.6.1)
mini_portile (0.6.2)
minitest (5.3.3)
mocha (0.14.0)
Expand Down Expand Up @@ -148,7 +147,7 @@ GEM
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
rake (10.4.2)
rdoc (4.2.0)
Expand Down Expand Up @@ -192,12 +191,9 @@ GEM
serverengine
thor
thread
sprockets (2.12.3)
hike (~> 1.2)
multi_json (~> 1.0)
sprockets (3.2.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.4)
sprockets-rails (2.3.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
Expand Down Expand Up @@ -271,3 +267,6 @@ DEPENDENCIES
turbolinks
uglifier (>= 1.3.0)
w3c_validators

BUNDLED WITH
1.10.1
2 changes: 1 addition & 1 deletion RAILS_VERSION
@@ -1 +1 @@
4.2.1
4.2.2
5 changes: 5 additions & 0 deletions actionmailer/CHANGELOG.md
@@ -1,3 +1,8 @@
## Rails 4.2.2 (June 16, 2015) ##

* No Changes *


## Rails 4.2.1 (March 19, 2014) ##

* No changes *
Expand Down
2 changes: 1 addition & 1 deletion actionmailer/lib/action_mailer/gem_version.rb
Expand Up @@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 2
TINY = 1
TINY = 2
PRE = nil

STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
Expand Down
5 changes: 5 additions & 0 deletions actionpack/CHANGELOG.md
@@ -1,3 +1,8 @@
## Rails 4.2.2 (June 16, 2015) ##

* No Changes *


## Rails 4.2.1 (March 19, 2014) ##

* Non-string authenticity tokens do not raise NoMethodError when decoding
Expand Down
2 changes: 1 addition & 1 deletion actionpack/lib/action_pack/gem_version.rb
Expand Up @@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 2
TINY = 1
TINY = 2
PRE = nil

STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
Expand Down
5 changes: 5 additions & 0 deletions actionview/CHANGELOG.md
@@ -1,3 +1,8 @@
## Rails 4.2.2 (June 16, 2015) ##

* No Changes *


## Rails 4.2.1 (March 19, 2014) ##

* Default translations that have a lower precidence than an html safe default,
Expand Down
2 changes: 1 addition & 1 deletion actionview/lib/action_view/gem_version.rb
Expand Up @@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 2
TINY = 1
TINY = 2
PRE = nil

STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
Expand Down
5 changes: 5 additions & 0 deletions activejob/CHANGELOG.md
@@ -1,3 +1,8 @@
## Rails 4.2.2 (June 16, 2015) ##

* No Changes *


## Rails 4.2.1 (March 19, 2014) ##

* Allow keyword arguments to be used with Active Job.
Expand Down
2 changes: 1 addition & 1 deletion activejob/lib/active_job/gem_version.rb
Expand Up @@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 2
TINY = 1
TINY = 2
PRE = nil

STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
Expand Down
5 changes: 5 additions & 0 deletions activemodel/CHANGELOG.md
@@ -1,3 +1,8 @@
## Rails 4.2.2 (June 16, 2015) ##

* No Changes *


## Rails 4.2.1 (March 19, 2014) ##

* No changes *
Expand Down
2 changes: 1 addition & 1 deletion activemodel/lib/active_model/gem_version.rb
Expand Up @@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 2
TINY = 1
TINY = 2
PRE = nil

STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
Expand Down
5 changes: 5 additions & 0 deletions activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
## Rails 4.2.2 (June 16, 2015) ##

* No Changes *


## Rails 4.2.1 (March 19, 2014) ##

* Fixed ActiveRecord::Relation#becomes! and changed_attributes issues for type column
Expand Down
2 changes: 1 addition & 1 deletion activerecord/lib/active_record/gem_version.rb
Expand Up @@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 2
TINY = 1
TINY = 2
PRE = nil

STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
Expand Down
15 changes: 15 additions & 0 deletions activesupport/CHANGELOG.md
@@ -1,3 +1,18 @@
## Rails 4.2.2 (June 16, 2015) ##

* Fix XSS vulnerability in `ActiveSupport::JSON.encode` method.

CVE-2015-3226.

*Rafael Mendonça França*

* Fix denial of service vulnerability in the XML processing.

CVE-2015-3227.

*Aaron Patterson*


## Rails 4.2.1 (March 19, 2014) ##

* Fixed a problem where String#truncate_words would get stuck with a complex
Expand Down
2 changes: 1 addition & 1 deletion activesupport/lib/active_support/gem_version.rb
Expand Up @@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 2
TINY = 1
TINY = 2
PRE = nil

STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
Expand Down
5 changes: 5 additions & 0 deletions guides/CHANGELOG.md
@@ -1,3 +1,8 @@
## Rails 4.2.2 (June 16, 2014) ##

* No Changes *


## Rails 4.2.1 (March 19, 2014) ##

* No Changes *
Expand Down
5 changes: 5 additions & 0 deletions railties/CHANGELOG.md
@@ -1,3 +1,8 @@
## Rails 4.2.2 (June 16, 2015) ##

* No Changes *


## Rails 4.2.1 (March 19, 2014) ##

* Add a new-line to the end of route method generated code.
Expand Down
2 changes: 1 addition & 1 deletion railties/lib/rails/gem_version.rb
Expand Up @@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 2
TINY = 1
TINY = 2
PRE = nil

STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
Expand Down
2 changes: 1 addition & 1 deletion version.rb
Expand Up @@ -7,7 +7,7 @@ def self.gem_version
module VERSION
MAJOR = 4
MINOR = 2
TINY = 1
TINY = 2
PRE = nil

STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
Expand Down

0 comments on commit 5d101c3

Please sign in to comment.