Download as
Browse Code »

Commit 78bb6c48f1f1aaecda0486e86c172c3a1cf9cf72

Authored by Arthur Nogueira Neves
2 parents 78c34e2f 61e6df3a
Exists in master and in 1 other branch production

Merge pull request #691 from dylanahsmith/rails-security-fix 

Bump Rails version to 3.2.18 for security fixes.
Showing 2 changed files with 33 additions and 33 deletions   Show diff stats
1 source 'https://rubygems.org' 1 source 'https://rubygems.org'
2 2
3 -RAILS_VERSION = '~> 3.2.17' 3 +RAILS_VERSION = '~> 3.2.18'
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.17)  
5 - actionpack (= 3.2.17) 4 + actionmailer (3.2.18)
  5 + actionpack (= 3.2.18)
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.17)  
12 - activemodel (= 3.2.17)  
13 - activesupport (= 3.2.17) 11 + actionpack (3.2.18)
  12 + activemodel (= 3.2.18)
  13 + activesupport (= 3.2.18)
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.17)  
22 - activesupport (= 3.2.17) 21 + activemodel (3.2.18)
  22 + activesupport (= 3.2.18)
23 builder (~> 3.0.0) 23 builder (~> 3.0.0)
24 - activerecord (3.2.17)  
25 - activemodel (= 3.2.17)  
26 - activesupport (= 3.2.17) 24 + activerecord (3.2.18)
  25 + activemodel (= 3.2.18)
  26 + activesupport (= 3.2.18)
27 arel (~> 3.0.2) 27 arel (~> 3.0.2)
28 tzinfo (~> 0.3.29) 28 tzinfo (~> 0.3.29)
29 - activeresource (3.2.17)  
30 - activemodel (= 3.2.17)  
31 - activesupport (= 3.2.17)  
32 - activesupport (3.2.17) 29 + activeresource (3.2.18)
  30 + activemodel (= 3.2.18)
  31 + activesupport (= 3.2.18)
  32 + activesupport (3.2.18)
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)
@@ -183,7 +183,7 @@ GEM @@ -183,7 +183,7 @@ GEM
183 rails (>= 3.2.0) 183 rails (>= 3.2.0)
184 railties (>= 3.2.0) 184 railties (>= 3.2.0)
185 moped (1.5.1) 185 moped (1.5.1)
186 - multi_json (1.9.2) 186 + multi_json (1.10.0)
187 multi_xml (0.5.5) 187 multi_xml (0.5.5)
188 multipart-post (1.2.0) 188 multipart-post (1.2.0)
189 net-scp (1.1.2) 189 net-scp (1.1.2)
@@ -250,30 +250,30 @@ GEM @@ -250,30 +250,30 @@ GEM
250 rack (>= 0.4) 250 rack (>= 0.4)
251 rack-contrib (1.1.0) 251 rack-contrib (1.1.0)
252 rack (>= 0.9.1) 252 rack (>= 0.9.1)
253 - rack-ssl (1.3.3) 253 + rack-ssl (1.3.4)
254 rack 254 rack
255 rack-ssl-enforcer (0.2.6) 255 rack-ssl-enforcer (0.2.6)
256 rack-test (0.6.2) 256 rack-test (0.6.2)
257 rack (>= 1.0) 257 rack (>= 1.0)
258 - rails (3.2.17)  
259 - actionmailer (= 3.2.17)  
260 - actionpack (= 3.2.17)  
261 - activerecord (= 3.2.17)  
262 - activeresource (= 3.2.17)  
263 - activesupport (= 3.2.17) 258 + rails (3.2.18)
  259 + actionmailer (= 3.2.18)
  260 + actionpack (= 3.2.18)
  261 + activerecord (= 3.2.18)
  262 + activeresource (= 3.2.18)
  263 + activesupport (= 3.2.18)
264 bundler (~> 1.0) 264 bundler (~> 1.0)
265 - railties (= 3.2.17) 265 + railties (= 3.2.18)
266 rails_autolink (1.1.4) 266 rails_autolink (1.1.4)
267 rails (> 3.1) 267 rails (> 3.1)
268 - railties (3.2.17)  
269 - actionpack (= 3.2.17)  
270 - activesupport (= 3.2.17) 268 + railties (3.2.18)
  269 + actionpack (= 3.2.18)
  270 + activesupport (= 3.2.18)
271 rack-ssl (~> 1.3.2) 271 rack-ssl (~> 1.3.2)
272 rake (>= 0.8.7) 272 rake (>= 0.8.7)
273 rdoc (~> 3.4) 273 rdoc (~> 3.4)
274 thor (>= 0.14.6, < 2.0) 274 thor (>= 0.14.6, < 2.0)
275 raindrops (0.12.0) 275 raindrops (0.12.0)
276 - rake (10.1.1) 276 + rake (10.3.1)
277 rbx-require-relative (0.0.9) 277 rbx-require-relative (0.0.9)
278 rdoc (3.12.2) 278 rdoc (3.12.2)
279 json (~> 1.4) 279 json (~> 1.4)
@@ -330,7 +330,7 @@ GEM @@ -330,7 +330,7 @@ GEM
330 therubyracer (0.12.0) 330 therubyracer (0.12.0)
331 libv8 (~> 3.16.14.0) 331 libv8 (~> 3.16.14.0)
332 ref 332 ref
333 - thor (0.18.1) 333 + thor (0.19.1)
334 thread_safe (0.1.3) 334 thread_safe (0.1.3)
335 atomic 335 atomic
336 tilt (1.4.1) 336 tilt (1.4.1)
@@ -342,7 +342,7 @@ GEM @@ -342,7 +342,7 @@ GEM
342 turbo-sprockets-rails3 (0.3.10) 342 turbo-sprockets-rails3 (0.3.10)
343 railties (> 3.2.8, < 4.0.0) 343 railties (> 3.2.8, < 4.0.0)
344 sprockets (>= 2.0.0) 344 sprockets (>= 2.0.0)
345 - tzinfo (0.3.38) 345 + tzinfo (0.3.39)
346 uglifier (2.2.1) 346 uglifier (2.2.1)
347 execjs (>= 0.3.0) 347 execjs (>= 0.3.0)
348 multi_json (~> 1.0, >= 1.0.2) 348 multi_json (~> 1.0, >= 1.0.2)
@@ -366,9 +366,9 @@ PLATFORMS @@ -366,9 +366,9 @@ PLATFORMS
366 ruby 366 ruby
367 367
368 DEPENDENCIES 368 DEPENDENCIES
369 - actionmailer (~> 3.2.17) 369 + actionmailer (~> 3.2.18)
370 actionmailer_inline_css 370 actionmailer_inline_css
371 - actionpack (~> 3.2.17) 371 + actionpack (~> 3.2.18)
372 airbrake 372 airbrake
373 better_errors 373 better_errors
374 binding_of_caller 374 binding_of_caller
@@ -413,7 +413,7 @@ DEPENDENCIES @@ -413,7 +413,7 @@ DEPENDENCIES
413 rack-ssl 413 rack-ssl
414 rack-ssl-enforcer 414 rack-ssl-enforcer
415 rails_autolink 415 rails_autolink
416 - railties (~> 3.2.17) 416 + railties (~> 3.2.18)
417 ri_cal 417 ri_cal
418 rspec-rails 418 rspec-rails
419 ruby-debug 419 ruby-debug