Skip to content
This repository was archived by the owner on Jan 24, 2025. It is now read-only.

Commit 79b2299

Browse files
author
Laurent Curau
authored
Merge pull request #524 from alphagov/laurent/rails-5-1-5
Upgrade Rails to version 5.1.5 from 5.1.4
2 parents f309945 + cd8bc0e commit 79b2299

File tree

2 files changed

+49
-48
lines changed

2 files changed

+49
-48
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22

33

4-
gem 'rails', '~> 5.1.4'
4+
gem 'rails', '~> 5.1.5'
55
gem 'pg', '~> 0.18'
66
gem 'puma', '~> 3.7'
77
gem 'sass-rails', '~> 5.0'

Gemfile.lock

+48-47
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (5.1.4)
5-
actionpack (= 5.1.4)
4+
actioncable (5.1.5)
5+
actionpack (= 5.1.5)
66
nio4r (~> 2.0)
77
websocket-driver (~> 0.6.1)
8-
actionmailer (5.1.4)
9-
actionpack (= 5.1.4)
10-
actionview (= 5.1.4)
11-
activejob (= 5.1.4)
8+
actionmailer (5.1.5)
9+
actionpack (= 5.1.5)
10+
actionview (= 5.1.5)
11+
activejob (= 5.1.5)
1212
mail (~> 2.5, >= 2.5.4)
1313
rails-dom-testing (~> 2.0)
14-
actionpack (5.1.4)
15-
actionview (= 5.1.4)
16-
activesupport (= 5.1.4)
14+
actionpack (5.1.5)
15+
actionview (= 5.1.5)
16+
activesupport (= 5.1.5)
1717
rack (~> 2.0)
1818
rack-test (>= 0.6.3)
1919
rails-dom-testing (~> 2.0)
2020
rails-html-sanitizer (~> 1.0, >= 1.0.2)
21-
actionview (5.1.4)
22-
activesupport (= 5.1.4)
21+
actionview (5.1.5)
22+
activesupport (= 5.1.5)
2323
builder (~> 3.1)
2424
erubi (~> 1.4)
2525
rails-dom-testing (~> 2.0)
@@ -38,16 +38,16 @@ GEM
3838
ransack (~> 1.3)
3939
sass-rails
4040
sprockets (< 4.1)
41-
activejob (5.1.4)
42-
activesupport (= 5.1.4)
41+
activejob (5.1.5)
42+
activesupport (= 5.1.5)
4343
globalid (>= 0.3.6)
44-
activemodel (5.1.4)
45-
activesupport (= 5.1.4)
46-
activerecord (5.1.4)
47-
activemodel (= 5.1.4)
48-
activesupport (= 5.1.4)
44+
activemodel (5.1.5)
45+
activesupport (= 5.1.5)
46+
activerecord (5.1.5)
47+
activemodel (= 5.1.5)
48+
activesupport (= 5.1.5)
4949
arel (~> 8.0)
50-
activesupport (5.1.4)
50+
activesupport (5.1.5)
5151
concurrent-ruby (~> 1.0, >= 1.0.2)
5252
i18n (~> 0.7)
5353
minitest (~> 5.1)
@@ -93,7 +93,7 @@ GEM
9393
connection_pool (2.2.1)
9494
crack (0.4.3)
9595
safe_yaml (~> 1.0.0)
96-
crass (1.0.2)
96+
crass (1.0.3)
9797
database_cleaner (1.6.1)
9898
debug_inspector (0.0.3)
9999
devise (4.3.0)
@@ -142,7 +142,7 @@ GEM
142142
formtastic_i18n (0.6.0)
143143
friendly_id (5.2.1)
144144
activerecord (>= 4.0.0)
145-
globalid (0.4.0)
145+
globalid (0.4.1)
146146
activesupport (>= 4.2.0)
147147
govuk-lint (3.3.0)
148148
rubocop (~> 0.49.0)
@@ -178,7 +178,7 @@ GEM
178178
hashie (3.5.5)
179179
http-cookie (1.0.3)
180180
domain_name (~> 0.5)
181-
i18n (0.9.0)
181+
i18n (0.9.5)
182182
concurrent-ruby (~> 1.0)
183183
iconv (1.0.4)
184184
inherited_resources (1.7.2)
@@ -220,24 +220,25 @@ GEM
220220
railties (>= 4, < 5.2)
221221
request_store (~> 1.0)
222222
logstash-event (1.2.02)
223-
loofah (2.1.1)
223+
loofah (2.2.0)
224224
crass (~> 1.0.2)
225225
nokogiri (>= 1.5.9)
226226
lumberjack (1.0.12)
227-
mail (2.6.6)
228-
mime-types (>= 1.16, < 4)
227+
mail (2.7.0)
228+
mini_mime (>= 0.1.1)
229229
method_source (0.8.2)
230230
mime-types (3.1)
231231
mime-types-data (~> 3.2015)
232232
mime-types-data (3.2016.0521)
233+
mini_mime (1.0.0)
233234
mini_portile2 (2.3.0)
234-
minitest (5.10.3)
235+
minitest (5.11.3)
235236
multi_json (1.12.1)
236237
multipart-post (2.0.0)
237238
nenv (0.3.0)
238239
netrc (0.11.0)
239-
nio4r (2.1.0)
240-
nokogiri (1.8.1)
240+
nio4r (2.2.0)
241+
nokogiri (1.8.2)
241242
mini_portile2 (~> 2.3.0)
242243
notiffany (0.1.1)
243244
nenv (~> 0.1)
@@ -264,32 +265,32 @@ GEM
264265
pry (>= 0.9.11)
265266
public_suffix (2.0.5)
266267
puma (3.9.1)
267-
rack (2.0.3)
268+
rack (2.0.4)
268269
rack-cors (1.0.1)
269270
rack-protection (2.0.0)
270271
rack
271-
rack-test (0.7.0)
272+
rack-test (0.8.2)
272273
rack (>= 1.0, < 3)
273-
rails (5.1.4)
274-
actioncable (= 5.1.4)
275-
actionmailer (= 5.1.4)
276-
actionpack (= 5.1.4)
277-
actionview (= 5.1.4)
278-
activejob (= 5.1.4)
279-
activemodel (= 5.1.4)
280-
activerecord (= 5.1.4)
281-
activesupport (= 5.1.4)
274+
rails (5.1.5)
275+
actioncable (= 5.1.5)
276+
actionmailer (= 5.1.5)
277+
actionpack (= 5.1.5)
278+
actionview (= 5.1.5)
279+
activejob (= 5.1.5)
280+
activemodel (= 5.1.5)
281+
activerecord (= 5.1.5)
282+
activesupport (= 5.1.5)
282283
bundler (>= 1.3.0)
283-
railties (= 5.1.4)
284+
railties (= 5.1.5)
284285
sprockets-rails (>= 2.0.0)
285286
rails-dom-testing (2.0.3)
286287
activesupport (>= 4.2.0)
287288
nokogiri (>= 1.6)
288289
rails-html-sanitizer (1.0.3)
289290
loofah (~> 2.0)
290-
railties (5.1.4)
291-
actionpack (= 5.1.4)
292-
activesupport (= 5.1.4)
291+
railties (5.1.5)
292+
actionpack (= 5.1.5)
293+
activesupport (= 5.1.5)
293294
method_source
294295
rake (>= 0.8.7)
295296
thor (>= 0.18.1, < 2.0)
@@ -396,7 +397,7 @@ GEM
396397
turbolinks (5.0.1)
397398
turbolinks-source (~> 5)
398399
turbolinks-source (5.0.3)
399-
tzinfo (1.2.4)
400+
tzinfo (1.2.5)
400401
thread_safe (~> 0.1)
401402
uglifier (3.2.0)
402403
execjs (>= 0.3.0, < 3)
@@ -417,7 +418,7 @@ GEM
417418
hashdiff
418419
websocket-driver (0.6.5)
419420
websocket-extensions (>= 0.1.0)
420-
websocket-extensions (0.1.2)
421+
websocket-extensions (0.1.3)
421422
whois (4.0.2)
422423
whois-parser (1.0.0)
423424
activesupport (>= 4)
@@ -465,7 +466,7 @@ DEPENDENCIES
465466
pry-stack_explorer (~> 0.4.9)
466467
puma (~> 3.7)
467468
rack-cors
468-
rails (~> 5.1.4)
469+
rails (~> 5.1.5)
469470
redis-namespace (~> 1.5.3)
470471
rest-client (~> 2.0.2)
471472
rspec (~> 3.6)
@@ -485,4 +486,4 @@ DEPENDENCIES
485486
whois-parser
486487

487488
BUNDLED WITH
488-
1.16.0.pre.3
489+
1.16.0

0 commit comments

Comments
 (0)