Skip to content

Commit dc25ae3

Browse files
authored
Merge pull request #671 from alphagov/rails-4-2-11-update
Update Rails to address vulnerability in Active Job
2 parents 8fd5a8a + e73249f commit dc25ae3

2 files changed

Lines changed: 39 additions & 39 deletions

File tree

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
33
# Load environment variables
44
gem 'dotenv-rails', :require => 'dotenv/rails-now'
55

6-
gem 'rails', '4.2.10'
6+
gem 'rails', '4.2.11'
77

88
gem 'rake'
99
gem 'pg', '< 0.21'

Gemfile.lock

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.2.10)
5-
actionpack (= 4.2.10)
6-
actionview (= 4.2.10)
7-
activejob (= 4.2.10)
4+
actionmailer (4.2.11)
5+
actionpack (= 4.2.11)
6+
actionview (= 4.2.11)
7+
activejob (= 4.2.11)
88
mail (~> 2.5, >= 2.5.4)
99
rails-dom-testing (~> 1.0, >= 1.0.5)
10-
actionpack (4.2.10)
11-
actionview (= 4.2.10)
12-
activesupport (= 4.2.10)
10+
actionpack (4.2.11)
11+
actionview (= 4.2.11)
12+
activesupport (= 4.2.11)
1313
rack (~> 1.6)
1414
rack-test (~> 0.6.2)
1515
rails-dom-testing (~> 1.0, >= 1.0.5)
1616
rails-html-sanitizer (~> 1.0, >= 1.0.2)
17-
actionview (4.2.10)
18-
activesupport (= 4.2.10)
17+
actionview (4.2.11)
18+
activesupport (= 4.2.11)
1919
builder (~> 3.1)
2020
erubis (~> 2.7.0)
2121
rails-dom-testing (~> 1.0, >= 1.0.5)
2222
rails-html-sanitizer (~> 1.0, >= 1.0.3)
23-
activejob (4.2.10)
24-
activesupport (= 4.2.10)
23+
activejob (4.2.11)
24+
activesupport (= 4.2.11)
2525
globalid (>= 0.3.0)
26-
activemodel (4.2.10)
27-
activesupport (= 4.2.10)
26+
activemodel (4.2.11)
27+
activesupport (= 4.2.11)
2828
builder (~> 3.1)
29-
activerecord (4.2.10)
30-
activemodel (= 4.2.10)
31-
activesupport (= 4.2.10)
29+
activerecord (4.2.11)
30+
activemodel (= 4.2.11)
31+
activesupport (= 4.2.11)
3232
arel (~> 6.0)
33-
activesupport (4.2.10)
33+
activesupport (4.2.11)
3434
i18n (~> 0.7)
3535
minitest (~> 5.1)
3636
thread_safe (~> 0.3, >= 0.3.4)
@@ -70,7 +70,7 @@ GEM
7070
climate_control (0.2.0)
7171
cliver (0.3.2)
7272
coderay (1.1.2)
73-
concurrent-ruby (1.0.5)
73+
concurrent-ruby (1.1.3)
7474
connection_pool (2.2.1)
7575
crack (0.4.3)
7676
safe_yaml (~> 1.0.0)
@@ -164,15 +164,15 @@ GEM
164164
loofah (2.2.3)
165165
crass (~> 1.0.2)
166166
nokogiri (>= 1.5.9)
167-
mail (2.7.0)
167+
mail (2.7.1)
168168
mini_mime (>= 0.1.1)
169169
maxminddb (0.1.14)
170170
method_source (0.9.0)
171171
mime-types (3.2.2)
172172
mime-types-data (~> 3.2015)
173173
mime-types-data (3.2018.0812)
174174
mimemagic (0.3.2)
175-
mini_mime (1.0.0)
175+
mini_mime (1.0.1)
176176
mini_portile2 (2.3.0)
177177
minitest (5.11.3)
178178
multi_json (1.12.2)
@@ -202,34 +202,34 @@ GEM
202202
method_source (~> 0.9.0)
203203
public_suffix (3.0.1)
204204
puma (3.11.0)
205-
rack (1.6.10)
205+
rack (1.6.11)
206206
rack-test (0.6.3)
207207
rack (>= 1.0)
208-
rails (4.2.10)
209-
actionmailer (= 4.2.10)
210-
actionpack (= 4.2.10)
211-
actionview (= 4.2.10)
212-
activejob (= 4.2.10)
213-
activemodel (= 4.2.10)
214-
activerecord (= 4.2.10)
215-
activesupport (= 4.2.10)
208+
rails (4.2.11)
209+
actionmailer (= 4.2.11)
210+
actionpack (= 4.2.11)
211+
actionview (= 4.2.11)
212+
activejob (= 4.2.11)
213+
activemodel (= 4.2.11)
214+
activerecord (= 4.2.11)
215+
activesupport (= 4.2.11)
216216
bundler (>= 1.3.0, < 2.0)
217-
railties (= 4.2.10)
217+
railties (= 4.2.11)
218218
sprockets-rails
219219
rails-deprecated_sanitizer (1.0.3)
220220
activesupport (>= 4.2.0.alpha)
221-
rails-dom-testing (1.0.8)
222-
activesupport (>= 4.2.0.beta, < 5.0)
221+
rails-dom-testing (1.0.9)
222+
activesupport (>= 4.2.0, < 5.0)
223223
nokogiri (~> 1.6)
224224
rails-deprecated_sanitizer (>= 1.0.1)
225225
rails-html-sanitizer (1.0.4)
226226
loofah (~> 2.2, >= 2.2.2)
227-
railties (4.2.10)
228-
actionpack (= 4.2.10)
229-
activesupport (= 4.2.10)
227+
railties (4.2.11)
228+
actionpack (= 4.2.11)
229+
activesupport (= 4.2.11)
230230
rake (>= 0.8.7)
231231
thor (>= 0.18.1, < 2.0)
232-
rake (12.3.0)
232+
rake (12.3.1)
233233
rb-fsevent (0.10.2)
234234
rb-inotify (0.9.10)
235235
ffi (>= 0.5.0, < 2)
@@ -280,7 +280,7 @@ GEM
280280
climate_control (>= 0.0.3, < 1.0)
281281
textacular (3.2.2)
282282
activerecord (>= 3.0, < 5.0)
283-
thor (0.20.0)
283+
thor (0.20.3)
284284
thread_safe (0.3.6)
285285
tilt (2.0.8)
286286
tzinfo (1.2.5)
@@ -342,7 +342,7 @@ DEPENDENCIES
342342
poltergeist
343343
pry
344344
puma
345-
rails (= 4.2.10)
345+
rails (= 4.2.11)
346346
rake
347347
redcarpet
348348
rspec-rails

0 commit comments

Comments
 (0)