Download as
Browse Code »

Commit ea168ac739c730a20b33fc3036759936193f9be4

Authored by Arthur Nogueira Neves
2 parents ce1cfb2f 2bc87de0
Exists in master and in 1 other branch production

Merge pull request #758 from levinalex/rails_3_2_21 

[CVE-2014-7829] upgrade rails to v3.2.21
Showing 2 changed files with 28 additions and 28 deletions   Show diff stats
Gemfile
  Diff comments   View file @ea168ac
1 1 source 'https://rubygems.org'
2 2  
3   -RAILS_VERSION = '~> 3.2.19'
  3 +RAILS_VERSION = '~> 3.2.21'
4 4  
5 5 gem 'actionmailer', RAILS_VERSION
6 6 gem 'actionpack', RAILS_VERSION
... ...
Gemfile.lock
  Diff comments   View file @ea168ac
1 1 GEM
2 2 remote: https://rubygems.org/
3 3 specs:
4   - actionmailer (3.2.19)
5   - actionpack (= 3.2.19)
  4 + actionmailer (3.2.21)
  5 + actionpack (= 3.2.21)
6 6 mail (~> 2.5.4)
7 7 actionmailer_inline_css (1.5.3)
8 8 actionmailer (>= 3.0.0)
9 9 nokogiri (>= 1.4.4)
10 10 premailer (>= 1.7.1)
11   - actionpack (3.2.19)
12   - activemodel (= 3.2.19)
13   - activesupport (= 3.2.19)
  11 + actionpack (3.2.21)
  12 + activemodel (= 3.2.21)
  13 + activesupport (= 3.2.21)
14 14 builder (~> 3.0.0)
15 15 erubis (~> 2.7.0)
16 16 journey (~> 1.0.4)
... ... @@ -18,18 +18,18 @@ GEM
18 18 rack-cache (~> 1.2)
19 19 rack-test (~> 0.6.1)
20 20 sprockets (~> 2.2.1)
21   - activemodel (3.2.19)
22   - activesupport (= 3.2.19)
  21 + activemodel (3.2.21)
  22 + activesupport (= 3.2.21)
23 23 builder (~> 3.0.0)
24   - activerecord (3.2.19)
25   - activemodel (= 3.2.19)
26   - activesupport (= 3.2.19)
  24 + activerecord (3.2.21)
  25 + activemodel (= 3.2.21)
  26 + activesupport (= 3.2.21)
27 27 arel (~> 3.0.2)
28 28 tzinfo (~> 0.3.29)
29   - activeresource (3.2.19)
30   - activemodel (= 3.2.19)
31   - activesupport (= 3.2.19)
32   - activesupport (3.2.19)
  29 + activeresource (3.2.21)
  30 + activemodel (= 3.2.21)
  31 + activesupport (= 3.2.21)
  32 + activesupport (3.2.21)
33 33 i18n (~> 0.6, >= 0.6.4)
34 34 multi_json (~> 1.0)
35 35 addressable (2.3.5)
... ... @@ -246,19 +246,19 @@ GEM
246 246 rack-ssl-enforcer (0.2.6)
247 247 rack-test (0.6.2)
248 248 rack (>= 1.0)
249   - rails (3.2.19)
250   - actionmailer (= 3.2.19)
251   - actionpack (= 3.2.19)
252   - activerecord (= 3.2.19)
253   - activeresource (= 3.2.19)
254   - activesupport (= 3.2.19)
  249 + rails (3.2.21)
  250 + actionmailer (= 3.2.21)
  251 + actionpack (= 3.2.21)
  252 + activerecord (= 3.2.21)
  253 + activeresource (= 3.2.21)
  254 + activesupport (= 3.2.21)
255 255 bundler (~> 1.0)
256   - railties (= 3.2.19)
257 256 rails_autolink (1.1.4)
258 257 rails (> 3.1)
259   - railties (3.2.19)
260   - actionpack (= 3.2.19)
261   - activesupport (= 3.2.19)
  258 + railties (= 3.2.21)
  259 + railties (3.2.21)
  260 + actionpack (= 3.2.21)
  261 + activesupport (= 3.2.21)
262 262 rack-ssl (~> 1.3.2)
263 263 rake (>= 0.8.7)
264 264 rdoc (~> 3.4)
... ... @@ -351,9 +351,9 @@ PLATFORMS
351 351 ruby
352 352  
353 353 DEPENDENCIES
354   - actionmailer (~> 3.2.19)
  354 + actionmailer (~> 3.2.21)
355 355 actionmailer_inline_css
356   - actionpack (~> 3.2.19)
  356 + actionpack (~> 3.2.21)
357 357 airbrake
358 358 better_errors
359 359 binding_of_caller
... ... @@ -397,7 +397,7 @@ DEPENDENCIES
397 397 rack-ssl
398 398 rack-ssl-enforcer
399 399 rails_autolink
400   - railties (~> 3.2.19)
  400 + railties (~> 3.2.21)
401 401 ri_cal
402 402 rspec-rails
403 403 ruby-fogbugz
... ...