Download as
Browse Code »

Commit 01e189467bb467f9da2f97fd708707bf43b7538d

Authored by Cyril Mougel
2 parents 1c6a1303 822a03cc
Exists in master and in 1 other branch production

Merge pull request #657 from alphagov/bump_rails 

Bump Rails version to 3.2.17
Showing 2 changed files with 30 additions and 30 deletions   Show diff stats
1 source 'https://rubygems.org' 1 source 'https://rubygems.org'
2 2
3 -RAILS_VERSION = '~> 3.2.15' 3 +RAILS_VERSION = '~> 3.2.17'
4 4
5 gem 'actionmailer', RAILS_VERSION 5 gem 'actionmailer', RAILS_VERSION
6 gem 'actionpack', RAILS_VERSION 6 gem 'actionpack', RAILS_VERSION
1 GEM 1 GEM
2 remote: https://rubygems.org/ 2 remote: https://rubygems.org/
3 specs: 3 specs:
4 - actionmailer (3.2.16)  
5 - actionpack (= 3.2.16) 4 + actionmailer (3.2.17)
  5 + actionpack (= 3.2.17)
6 mail (~> 2.5.4) 6 mail (~> 2.5.4)
7 actionmailer_inline_css (1.5.3) 7 actionmailer_inline_css (1.5.3)
8 actionmailer (>= 3.0.0) 8 actionmailer (>= 3.0.0)
9 nokogiri (>= 1.4.4) 9 nokogiri (>= 1.4.4)
10 premailer (>= 1.7.1) 10 premailer (>= 1.7.1)
11 - actionpack (3.2.16)  
12 - activemodel (= 3.2.16)  
13 - activesupport (= 3.2.16) 11 + actionpack (3.2.17)
  12 + activemodel (= 3.2.17)
  13 + activesupport (= 3.2.17)
14 builder (~> 3.0.0) 14 builder (~> 3.0.0)
15 erubis (~> 2.7.0) 15 erubis (~> 2.7.0)
16 journey (~> 1.0.4) 16 journey (~> 1.0.4)
@@ -18,18 +18,18 @@ GEM @@ -18,18 +18,18 @@ GEM
18 rack-cache (~> 1.2) 18 rack-cache (~> 1.2)
19 rack-test (~> 0.6.1) 19 rack-test (~> 0.6.1)
20 sprockets (~> 2.2.1) 20 sprockets (~> 2.2.1)
21 - activemodel (3.2.16)  
22 - activesupport (= 3.2.16) 21 + activemodel (3.2.17)
  22 + activesupport (= 3.2.17)
23 builder (~> 3.0.0) 23 builder (~> 3.0.0)
24 - activerecord (3.2.16)  
25 - activemodel (= 3.2.16)  
26 - activesupport (= 3.2.16) 24 + activerecord (3.2.17)
  25 + activemodel (= 3.2.17)
  26 + activesupport (= 3.2.17)
27 arel (~> 3.0.2) 27 arel (~> 3.0.2)
28 tzinfo (~> 0.3.29) 28 tzinfo (~> 0.3.29)
29 - activeresource (3.2.16)  
30 - activemodel (= 3.2.16)  
31 - activesupport (= 3.2.16)  
32 - activesupport (3.2.16) 29 + activeresource (3.2.17)
  30 + activemodel (= 3.2.17)
  31 + activesupport (= 3.2.17)
  32 + activesupport (3.2.17)
33 i18n (~> 0.6, >= 0.6.4) 33 i18n (~> 0.6, >= 0.6.4)
34 multi_json (~> 1.0) 34 multi_json (~> 1.0)
35 addressable (2.3.5) 35 addressable (2.3.5)
@@ -229,7 +229,7 @@ GEM @@ -229,7 +229,7 @@ GEM
229 rest-client (~> 1.6.0) 229 rest-client (~> 1.6.0)
230 pjax_rails (0.3.4) 230 pjax_rails (0.3.4)
231 jquery-rails 231 jquery-rails
232 - polyglot (0.3.3) 232 + polyglot (0.3.4)
233 premailer (1.7.3) 233 premailer (1.7.3)
234 css_parser (>= 1.1.9) 234 css_parser (>= 1.1.9)
235 htmlentities (>= 4.0.0) 235 htmlentities (>= 4.0.0)
@@ -253,25 +253,25 @@ GEM @@ -253,25 +253,25 @@ GEM
253 rack-ssl-enforcer (0.2.6) 253 rack-ssl-enforcer (0.2.6)
254 rack-test (0.6.2) 254 rack-test (0.6.2)
255 rack (>= 1.0) 255 rack (>= 1.0)
256 - rails (3.2.16)  
257 - actionmailer (= 3.2.16)  
258 - actionpack (= 3.2.16)  
259 - activerecord (= 3.2.16)  
260 - activeresource (= 3.2.16)  
261 - activesupport (= 3.2.16) 256 + rails (3.2.17)
  257 + actionmailer (= 3.2.17)
  258 + actionpack (= 3.2.17)
  259 + activerecord (= 3.2.17)
  260 + activeresource (= 3.2.17)
  261 + activesupport (= 3.2.17)
262 bundler (~> 1.0) 262 bundler (~> 1.0)
263 - railties (= 3.2.16) 263 + railties (= 3.2.17)
264 rails_autolink (1.1.4) 264 rails_autolink (1.1.4)
265 rails (> 3.1) 265 rails (> 3.1)
266 - railties (3.2.16)  
267 - actionpack (= 3.2.16)  
268 - activesupport (= 3.2.16) 266 + railties (3.2.17)
  267 + actionpack (= 3.2.17)
  268 + activesupport (= 3.2.17)
269 rack-ssl (~> 1.3.2) 269 rack-ssl (~> 1.3.2)
270 rake (>= 0.8.7) 270 rake (>= 0.8.7)
271 rdoc (~> 3.4) 271 rdoc (~> 3.4)
272 thor (>= 0.14.6, < 2.0) 272 thor (>= 0.14.6, < 2.0)
273 raindrops (0.12.0) 273 raindrops (0.12.0)
274 - rake (10.1.0) 274 + rake (10.1.1)
275 rbx-require-relative (0.0.9) 275 rbx-require-relative (0.0.9)
276 rdoc (3.12.2) 276 rdoc (3.12.2)
277 json (~> 1.4) 277 json (~> 1.4)
@@ -364,9 +364,9 @@ PLATFORMS @@ -364,9 +364,9 @@ PLATFORMS
364 ruby 364 ruby
365 365
366 DEPENDENCIES 366 DEPENDENCIES
367 - actionmailer (~> 3.2.15) 367 + actionmailer (~> 3.2.17)
368 actionmailer_inline_css 368 actionmailer_inline_css
369 - actionpack (~> 3.2.15) 369 + actionpack (~> 3.2.17)
370 airbrake 370 airbrake
371 better_errors 371 better_errors
372 binding_of_caller 372 binding_of_caller
@@ -411,7 +411,7 @@ DEPENDENCIES @@ -411,7 +411,7 @@ DEPENDENCIES
411 rack-ssl 411 rack-ssl
412 rack-ssl-enforcer 412 rack-ssl-enforcer
413 rails_autolink 413 rails_autolink
414 - railties (~> 3.2.15) 414 + railties (~> 3.2.17)
415 ri_cal 415 ri_cal
416 rspec-rails 416 rspec-rails
417 ruby-debug 417 ruby-debug