Skip to content

Commit 5d101c3

Browse files
committed
Preparing for 4.2.2 release
1 parent 78b29e0 commit 5d101c3

File tree

20 files changed

+103
-49
lines changed

20 files changed

+103
-49
lines changed

Gemfile.lock

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -14,55 +14,55 @@ GIT
1414
PATH
1515
remote: .
1616
specs:
17-
actionmailer (4.2.1.rc1)
18-
actionpack (= 4.2.1.rc1)
19-
actionview (= 4.2.1.rc1)
20-
activejob (= 4.2.1.rc1)
17+
actionmailer (4.2.2)
18+
actionpack (= 4.2.2)
19+
actionview (= 4.2.2)
20+
activejob (= 4.2.2)
2121
mail (~> 2.5, >= 2.5.4)
2222
rails-dom-testing (~> 1.0, >= 1.0.5)
23-
actionpack (4.2.1.rc1)
24-
actionview (= 4.2.1.rc1)
25-
activesupport (= 4.2.1.rc1)
23+
actionpack (4.2.2)
24+
actionview (= 4.2.2)
25+
activesupport (= 4.2.2)
2626
rack (~> 1.6)
2727
rack-test (~> 0.6.2)
2828
rails-dom-testing (~> 1.0, >= 1.0.5)
2929
rails-html-sanitizer (~> 1.0, >= 1.0.1)
30-
actionview (4.2.1.rc1)
31-
activesupport (= 4.2.1.rc1)
30+
actionview (4.2.2)
31+
activesupport (= 4.2.2)
3232
builder (~> 3.1)
3333
erubis (~> 2.7.0)
3434
rails-dom-testing (~> 1.0, >= 1.0.5)
3535
rails-html-sanitizer (~> 1.0, >= 1.0.1)
36-
activejob (4.2.1.rc1)
37-
activesupport (= 4.2.1.rc1)
36+
activejob (4.2.2)
37+
activesupport (= 4.2.2)
3838
globalid (>= 0.3.0)
39-
activemodel (4.2.1.rc1)
40-
activesupport (= 4.2.1.rc1)
39+
activemodel (4.2.2)
40+
activesupport (= 4.2.2)
4141
builder (~> 3.1)
42-
activerecord (4.2.1.rc1)
43-
activemodel (= 4.2.1.rc1)
44-
activesupport (= 4.2.1.rc1)
42+
activerecord (4.2.2)
43+
activemodel (= 4.2.2)
44+
activesupport (= 4.2.2)
4545
arel (~> 6.0)
46-
activesupport (4.2.1.rc1)
46+
activesupport (4.2.2)
4747
i18n (~> 0.7)
4848
json (~> 1.7, >= 1.7.7)
4949
minitest (~> 5.1)
5050
thread_safe (~> 0.3, >= 0.3.4)
5151
tzinfo (~> 1.1)
52-
rails (4.2.1.rc1)
53-
actionmailer (= 4.2.1.rc1)
54-
actionpack (= 4.2.1.rc1)
55-
actionview (= 4.2.1.rc1)
56-
activejob (= 4.2.1.rc1)
57-
activemodel (= 4.2.1.rc1)
58-
activerecord (= 4.2.1.rc1)
59-
activesupport (= 4.2.1.rc1)
52+
rails (4.2.2)
53+
actionmailer (= 4.2.2)
54+
actionpack (= 4.2.2)
55+
actionview (= 4.2.2)
56+
activejob (= 4.2.2)
57+
activemodel (= 4.2.2)
58+
activerecord (= 4.2.2)
59+
activesupport (= 4.2.2)
6060
bundler (>= 1.3.0, < 2.0)
61-
railties (= 4.2.1.rc1)
61+
railties (= 4.2.2)
6262
sprockets-rails
63-
railties (4.2.1.rc1)
64-
actionpack (= 4.2.1.rc1)
65-
activesupport (= 4.2.1.rc1)
63+
railties (4.2.2)
64+
actionpack (= 4.2.2)
65+
activesupport (= 4.2.2)
6666
rake (>= 0.8.7)
6767
thor (>= 0.18.1, < 2.0)
6868

@@ -99,9 +99,8 @@ GEM
9999
delayed_job (>= 3.0, < 4.1)
100100
erubis (2.7.0)
101101
execjs (2.3.0)
102-
globalid (0.3.3)
102+
globalid (0.3.5)
103103
activesupport (>= 4.1.0)
104-
hike (1.2.3)
105104
hitimes (1.2.2)
106105
i18n (0.7.0)
107106
jquery-rails (4.0.3)
@@ -112,12 +111,12 @@ GEM
112111
kindlerb (0.1.1)
113112
mustache
114113
nokogiri
115-
loofah (2.0.1)
114+
loofah (2.0.2)
116115
nokogiri (>= 1.5.9)
117116
mail (2.6.3)
118117
mime-types (>= 1.16, < 3)
119118
metaclass (0.0.4)
120-
mime-types (2.4.3)
119+
mime-types (2.6.1)
121120
mini_portile (0.6.2)
122121
minitest (5.3.3)
123122
mocha (0.14.0)
@@ -148,7 +147,7 @@ GEM
148147
activesupport (>= 4.2.0.beta, < 5.0)
149148
nokogiri (~> 1.6.0)
150149
rails-deprecated_sanitizer (>= 1.0.1)
151-
rails-html-sanitizer (1.0.1)
150+
rails-html-sanitizer (1.0.2)
152151
loofah (~> 2.0)
153152
rake (10.4.2)
154153
rdoc (4.2.0)
@@ -192,12 +191,9 @@ GEM
192191
serverengine
193192
thor
194193
thread
195-
sprockets (2.12.3)
196-
hike (~> 1.2)
197-
multi_json (~> 1.0)
194+
sprockets (3.2.0)
198195
rack (~> 1.0)
199-
tilt (~> 1.1, != 1.3.0)
200-
sprockets-rails (2.2.4)
196+
sprockets-rails (2.3.1)
201197
actionpack (>= 3.0)
202198
activesupport (>= 3.0)
203199
sprockets (>= 2.8, < 4.0)
@@ -271,3 +267,6 @@ DEPENDENCIES
271267
turbolinks
272268
uglifier (>= 1.3.0)
273269
w3c_validators
270+
271+
BUNDLED WITH
272+
1.10.1

RAILS_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.2.1
1+
4.2.2

actionmailer/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Rails 4.2.2 (June 16, 2015) ##
2+
3+
* No Changes *
4+
5+
16
## Rails 4.2.1 (March 19, 2014) ##
27

38
* No changes *

actionmailer/lib/action_mailer/gem_version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def self.gem_version
77
module VERSION
88
MAJOR = 4
99
MINOR = 2
10-
TINY = 1
10+
TINY = 2
1111
PRE = nil
1212

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

actionpack/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Rails 4.2.2 (June 16, 2015) ##
2+
3+
* No Changes *
4+
5+
16
## Rails 4.2.1 (March 19, 2014) ##
27

38
* Non-string authenticity tokens do not raise NoMethodError when decoding

actionpack/lib/action_pack/gem_version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def self.gem_version
77
module VERSION
88
MAJOR = 4
99
MINOR = 2
10-
TINY = 1
10+
TINY = 2
1111
PRE = nil
1212

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

actionview/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Rails 4.2.2 (June 16, 2015) ##
2+
3+
* No Changes *
4+
5+
16
## Rails 4.2.1 (March 19, 2014) ##
27

38
* Default translations that have a lower precidence than an html safe default,

actionview/lib/action_view/gem_version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def self.gem_version
77
module VERSION
88
MAJOR = 4
99
MINOR = 2
10-
TINY = 1
10+
TINY = 2
1111
PRE = nil
1212

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

activejob/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## Rails 4.2.2 (June 16, 2015) ##
2+
3+
* No Changes *
4+
5+
16
## Rails 4.2.1 (March 19, 2014) ##
27

38
* Allow keyword arguments to be used with Active Job.

activejob/lib/active_job/gem_version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ def self.gem_version
77
module VERSION
88
MAJOR = 4
99
MINOR = 2
10-
TINY = 1
10+
TINY = 2
1111
PRE = nil
1212

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

0 commit comments

Comments
 (0)