Skip to content

Commit 8af3a81

Browse files
committed
Update Rails to 4.2.10 and 5.0.6
1 parent b453e52 commit 8af3a81

File tree

6 files changed

+126
-123
lines changed

6 files changed

+126
-123
lines changed

Appraisals

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# frozen_string_literal: true
22

33
appraise "rails-4" do
4-
gem "rails", "4.2.9"
4+
gem "rails", "4.2.10"
55
end
66

77
appraise "rails-5" do
8-
gem "rails", "5.0.5"
8+
gem "rails", "5.0.6"
99
end
1010

1111
appraise "rails-5-1" do

gemfiles/rails_4.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
source "https://rubygems.org"
44

5-
gem "rails", "4.2.9"
5+
gem "rails", "4.2.10"
66

77
gemspec path: "../"

gemfiles/rails_4.gemfile.lock

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,36 @@ PATH
66
GEM
77
remote: https://rubygems.org/
88
specs:
9-
actionmailer (4.2.9)
10-
actionpack (= 4.2.9)
11-
actionview (= 4.2.9)
12-
activejob (= 4.2.9)
9+
actionmailer (4.2.10)
10+
actionpack (= 4.2.10)
11+
actionview (= 4.2.10)
12+
activejob (= 4.2.10)
1313
mail (~> 2.5, >= 2.5.4)
1414
rails-dom-testing (~> 1.0, >= 1.0.5)
15-
actionpack (4.2.9)
16-
actionview (= 4.2.9)
17-
activesupport (= 4.2.9)
15+
actionpack (4.2.10)
16+
actionview (= 4.2.10)
17+
activesupport (= 4.2.10)
1818
rack (~> 1.6)
1919
rack-test (~> 0.6.2)
2020
rails-dom-testing (~> 1.0, >= 1.0.5)
2121
rails-html-sanitizer (~> 1.0, >= 1.0.2)
22-
actionview (4.2.9)
23-
activesupport (= 4.2.9)
22+
actionview (4.2.10)
23+
activesupport (= 4.2.10)
2424
builder (~> 3.1)
2525
erubis (~> 2.7.0)
2626
rails-dom-testing (~> 1.0, >= 1.0.5)
2727
rails-html-sanitizer (~> 1.0, >= 1.0.3)
28-
activejob (4.2.9)
29-
activesupport (= 4.2.9)
28+
activejob (4.2.10)
29+
activesupport (= 4.2.10)
3030
globalid (>= 0.3.0)
31-
activemodel (4.2.9)
32-
activesupport (= 4.2.9)
31+
activemodel (4.2.10)
32+
activesupport (= 4.2.10)
3333
builder (~> 3.1)
34-
activerecord (4.2.9)
35-
activemodel (= 4.2.9)
36-
activesupport (= 4.2.9)
34+
activerecord (4.2.10)
35+
activemodel (= 4.2.10)
36+
activesupport (= 4.2.10)
3737
arel (~> 6.0)
38-
activesupport (4.2.9)
38+
activesupport (4.2.10)
3939
i18n (~> 0.7)
4040
minitest (~> 5.1)
4141
thread_safe (~> 0.3, >= 0.3.4)
@@ -48,60 +48,61 @@ GEM
4848
ast (2.3.0)
4949
builder (3.2.3)
5050
concurrent-ruby (1.0.5)
51+
crass (1.0.3)
5152
diff-lcs (1.3)
5253
docile (1.1.5)
5354
erubis (2.7.0)
5455
factory_girl (4.8.0)
5556
activesupport (>= 3.0.0)
56-
globalid (0.4.0)
57+
globalid (0.4.1)
5758
activesupport (>= 4.2.0)
58-
i18n (0.8.6)
59+
i18n (0.9.1)
60+
concurrent-ruby (~> 1.0)
5961
json (2.1.0)
60-
loofah (2.0.3)
62+
loofah (2.1.1)
63+
crass (~> 1.0.2)
6164
nokogiri (>= 1.5.9)
62-
mail (2.6.6)
63-
mime-types (>= 1.16, < 4)
64-
mime-types (3.1)
65-
mime-types-data (~> 3.2015)
66-
mime-types-data (3.2016.0521)
67-
mini_portile2 (2.2.0)
68-
minitest (5.10.3)
69-
nokogiri (1.8.0)
70-
mini_portile2 (~> 2.2.0)
65+
mail (2.7.0)
66+
mini_mime (>= 0.1.1)
67+
mini_mime (1.0.0)
68+
mini_portile2 (2.3.0)
69+
minitest (5.11.1)
70+
nokogiri (1.8.1)
71+
mini_portile2 (~> 2.3.0)
7172
parallel (1.12.0)
7273
parser (2.4.0.0)
7374
ast (~> 2.2)
7475
powerpack (0.1.1)
7576
rack (1.6.8)
7677
rack-test (0.6.3)
7778
rack (>= 1.0)
78-
rails (4.2.9)
79-
actionmailer (= 4.2.9)
80-
actionpack (= 4.2.9)
81-
actionview (= 4.2.9)
82-
activejob (= 4.2.9)
83-
activemodel (= 4.2.9)
84-
activerecord (= 4.2.9)
85-
activesupport (= 4.2.9)
79+
rails (4.2.10)
80+
actionmailer (= 4.2.10)
81+
actionpack (= 4.2.10)
82+
actionview (= 4.2.10)
83+
activejob (= 4.2.10)
84+
activemodel (= 4.2.10)
85+
activerecord (= 4.2.10)
86+
activesupport (= 4.2.10)
8687
bundler (>= 1.3.0, < 2.0)
87-
railties (= 4.2.9)
88+
railties (= 4.2.10)
8889
sprockets-rails
8990
rails-deprecated_sanitizer (1.0.3)
9091
activesupport (>= 4.2.0.alpha)
91-
rails-dom-testing (1.0.8)
92-
activesupport (>= 4.2.0.beta, < 5.0)
92+
rails-dom-testing (1.0.9)
93+
activesupport (>= 4.2.0, < 5.0)
9394
nokogiri (~> 1.6)
9495
rails-deprecated_sanitizer (>= 1.0.1)
9596
rails-html-sanitizer (1.0.3)
9697
loofah (~> 2.0)
97-
railties (4.2.9)
98-
actionpack (= 4.2.9)
99-
activesupport (= 4.2.9)
98+
railties (4.2.10)
99+
actionpack (= 4.2.10)
100+
activesupport (= 4.2.10)
100101
rake (>= 0.8.7)
101102
thor (>= 0.18.1, < 2.0)
102103
rainbow (2.2.2)
103104
rake
104-
rake (12.0.0)
105+
rake (12.3.0)
105106
rspec (3.6.0)
106107
rspec-core (~> 3.6.0)
107108
rspec-expectations (~> 3.6.0)
@@ -131,14 +132,14 @@ GEM
131132
sprockets (3.7.1)
132133
concurrent-ruby (~> 1.0)
133134
rack (> 1, < 3)
134-
sprockets-rails (3.2.0)
135+
sprockets-rails (3.2.1)
135136
actionpack (>= 4.0)
136137
activesupport (>= 4.0)
137138
sprockets (>= 3.0.0)
138139
sqlite3 (1.3.13)
139140
thor (0.20.0)
140141
thread_safe (0.3.6)
141-
tzinfo (1.2.3)
142+
tzinfo (1.2.4)
142143
thread_safe (~> 0.1)
143144
unicode-display_width (1.3.0)
144145

@@ -149,11 +150,11 @@ DEPENDENCIES
149150
acts_as_votable!
150151
appraisal (~> 2.2)
151152
factory_girl (~> 4.8)
152-
rails (= 4.2.9)
153+
rails (= 4.2.10)
153154
rspec (~> 3.6)
154155
rubocop (~> 0.49.1)
155156
simplecov (~> 0.15.0)
156157
sqlite3 (~> 1.3)
157158

158159
BUNDLED WITH
159-
1.15.4
160+
1.16.1

gemfiles/rails_5.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
source "https://rubygems.org"
44

5-
gem "rails", "5.0.5"
5+
gem "rails", "5.0.6"
66

77
gemspec path: "../"

gemfiles/rails_5.gemfile.lock

Lines changed: 52 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,39 @@ PATH
66
GEM
77
remote: https://rubygems.org/
88
specs:
9-
actioncable (5.0.5)
10-
actionpack (= 5.0.5)
9+
actioncable (5.0.6)
10+
actionpack (= 5.0.6)
1111
nio4r (>= 1.2, < 3.0)
1212
websocket-driver (~> 0.6.1)
13-
actionmailer (5.0.5)
14-
actionpack (= 5.0.5)
15-
actionview (= 5.0.5)
16-
activejob (= 5.0.5)
13+
actionmailer (5.0.6)
14+
actionpack (= 5.0.6)
15+
actionview (= 5.0.6)
16+
activejob (= 5.0.6)
1717
mail (~> 2.5, >= 2.5.4)
1818
rails-dom-testing (~> 2.0)
19-
actionpack (5.0.5)
20-
actionview (= 5.0.5)
21-
activesupport (= 5.0.5)
19+
actionpack (5.0.6)
20+
actionview (= 5.0.6)
21+
activesupport (= 5.0.6)
2222
rack (~> 2.0)
2323
rack-test (~> 0.6.3)
2424
rails-dom-testing (~> 2.0)
2525
rails-html-sanitizer (~> 1.0, >= 1.0.2)
26-
actionview (5.0.5)
27-
activesupport (= 5.0.5)
26+
actionview (5.0.6)
27+
activesupport (= 5.0.6)
2828
builder (~> 3.1)
2929
erubis (~> 2.7.0)
3030
rails-dom-testing (~> 2.0)
3131
rails-html-sanitizer (~> 1.0, >= 1.0.3)
32-
activejob (5.0.5)
33-
activesupport (= 5.0.5)
32+
activejob (5.0.6)
33+
activesupport (= 5.0.6)
3434
globalid (>= 0.3.6)
35-
activemodel (5.0.5)
36-
activesupport (= 5.0.5)
37-
activerecord (5.0.5)
38-
activemodel (= 5.0.5)
39-
activesupport (= 5.0.5)
35+
activemodel (5.0.6)
36+
activesupport (= 5.0.6)
37+
activerecord (5.0.6)
38+
activemodel (= 5.0.6)
39+
activesupport (= 5.0.6)
4040
arel (~> 7.0)
41-
activesupport (5.0.5)
41+
activesupport (5.0.6)
4242
concurrent-ruby (~> 1.0, >= 1.0.2)
4343
i18n (~> 0.7)
4444
minitest (~> 5.1)
@@ -51,61 +51,62 @@ GEM
5151
ast (2.3.0)
5252
builder (3.2.3)
5353
concurrent-ruby (1.0.5)
54+
crass (1.0.3)
5455
diff-lcs (1.3)
5556
docile (1.1.5)
5657
erubis (2.7.0)
5758
factory_girl (4.8.0)
5859
activesupport (>= 3.0.0)
59-
globalid (0.4.0)
60+
globalid (0.4.1)
6061
activesupport (>= 4.2.0)
61-
i18n (0.8.6)
62+
i18n (0.9.1)
63+
concurrent-ruby (~> 1.0)
6264
json (2.1.0)
63-
loofah (2.0.3)
65+
loofah (2.1.1)
66+
crass (~> 1.0.2)
6467
nokogiri (>= 1.5.9)
65-
mail (2.6.6)
66-
mime-types (>= 1.16, < 4)
67-
method_source (0.8.2)
68-
mime-types (3.1)
69-
mime-types-data (~> 3.2015)
70-
mime-types-data (3.2016.0521)
71-
mini_portile2 (2.2.0)
72-
minitest (5.10.3)
73-
nio4r (2.1.0)
74-
nokogiri (1.8.0)
75-
mini_portile2 (~> 2.2.0)
68+
mail (2.7.0)
69+
mini_mime (>= 0.1.1)
70+
method_source (0.9.0)
71+
mini_mime (1.0.0)
72+
mini_portile2 (2.3.0)
73+
minitest (5.11.1)
74+
nio4r (2.2.0)
75+
nokogiri (1.8.1)
76+
mini_portile2 (~> 2.3.0)
7677
parallel (1.12.0)
7778
parser (2.4.0.0)
7879
ast (~> 2.2)
7980
powerpack (0.1.1)
8081
rack (2.0.3)
8182
rack-test (0.6.3)
8283
rack (>= 1.0)
83-
rails (5.0.5)
84-
actioncable (= 5.0.5)
85-
actionmailer (= 5.0.5)
86-
actionpack (= 5.0.5)
87-
actionview (= 5.0.5)
88-
activejob (= 5.0.5)
89-
activemodel (= 5.0.5)
90-
activerecord (= 5.0.5)
91-
activesupport (= 5.0.5)
84+
rails (5.0.6)
85+
actioncable (= 5.0.6)
86+
actionmailer (= 5.0.6)
87+
actionpack (= 5.0.6)
88+
actionview (= 5.0.6)
89+
activejob (= 5.0.6)
90+
activemodel (= 5.0.6)
91+
activerecord (= 5.0.6)
92+
activesupport (= 5.0.6)
9293
bundler (>= 1.3.0)
93-
railties (= 5.0.5)
94+
railties (= 5.0.6)
9495
sprockets-rails (>= 2.0.0)
9596
rails-dom-testing (2.0.3)
9697
activesupport (>= 4.2.0)
9798
nokogiri (>= 1.6)
9899
rails-html-sanitizer (1.0.3)
99100
loofah (~> 2.0)
100-
railties (5.0.5)
101-
actionpack (= 5.0.5)
102-
activesupport (= 5.0.5)
101+
railties (5.0.6)
102+
actionpack (= 5.0.6)
103+
activesupport (= 5.0.6)
103104
method_source
104105
rake (>= 0.8.7)
105106
thor (>= 0.18.1, < 2.0)
106107
rainbow (2.2.2)
107108
rake
108-
rake (12.0.0)
109+
rake (12.3.0)
109110
rspec (3.6.0)
110111
rspec-core (~> 3.6.0)
111112
rspec-expectations (~> 3.6.0)
@@ -142,12 +143,12 @@ GEM
142143
sqlite3 (1.3.13)
143144
thor (0.20.0)
144145
thread_safe (0.3.6)
145-
tzinfo (1.2.3)
146+
tzinfo (1.2.4)
146147
thread_safe (~> 0.1)
147148
unicode-display_width (1.3.0)
148149
websocket-driver (0.6.5)
149150
websocket-extensions (>= 0.1.0)
150-
websocket-extensions (0.1.2)
151+
websocket-extensions (0.1.3)
151152

152153
PLATFORMS
153154
ruby
@@ -156,11 +157,11 @@ DEPENDENCIES
156157
acts_as_votable!
157158
appraisal (~> 2.2)
158159
factory_girl (~> 4.8)
159-
rails (= 5.0.5)
160+
rails (= 5.0.6)
160161
rspec (~> 3.6)
161162
rubocop (~> 0.49.1)
162163
simplecov (~> 0.15.0)
163164
sqlite3 (~> 1.3)
164165

165166
BUNDLED WITH
166-
1.15.4
167+
1.16.1

0 commit comments

Comments
 (0)