Commit 1b41b7c9891089b49a702d8986e6da821c311c58
Exists in
spb-stable
and in
3 other branches
Merge branch 'rails-4-0-3' into 'master'
Rails 4.0.3 Blog post with more information http://weblog.rubyonrails.org/2014/2/18/Rails_3_2_17_4_0_3_and_4_1_0_beta2_have_been_released/
Showing
1 changed file
with
22 additions
and
22 deletions
Show diff stats
Gemfile.lock
| @@ -9,11 +9,11 @@ GEM | @@ -9,11 +9,11 @@ GEM | ||
| 9 | remote: https://rubygems.org/ | 9 | remote: https://rubygems.org/ |
| 10 | specs: | 10 | specs: |
| 11 | ace-rails-ap (2.0.1) | 11 | ace-rails-ap (2.0.1) |
| 12 | - actionmailer (4.0.2) | ||
| 13 | - actionpack (= 4.0.2) | 12 | + actionmailer (4.0.3) |
| 13 | + actionpack (= 4.0.3) | ||
| 14 | mail (~> 2.5.4) | 14 | mail (~> 2.5.4) |
| 15 | - actionpack (4.0.2) | ||
| 16 | - activesupport (= 4.0.2) | 15 | + actionpack (4.0.3) |
| 16 | + activesupport (= 4.0.3) | ||
| 17 | builder (~> 3.1.0) | 17 | builder (~> 3.1.0) |
| 18 | erubis (~> 2.7.0) | 18 | erubis (~> 2.7.0) |
| 19 | rack (~> 1.5.2) | 19 | rack (~> 1.5.2) |
| @@ -22,16 +22,16 @@ GEM | @@ -22,16 +22,16 @@ GEM | ||
| 22 | actionpack (>= 4.0.0, < 5.0) | 22 | actionpack (>= 4.0.0, < 5.0) |
| 23 | actionpack-page_caching (1.0.2) | 23 | actionpack-page_caching (1.0.2) |
| 24 | actionpack (>= 4.0.0, < 5) | 24 | actionpack (>= 4.0.0, < 5) |
| 25 | - activemodel (4.0.2) | ||
| 26 | - activesupport (= 4.0.2) | 25 | + activemodel (4.0.3) |
| 26 | + activesupport (= 4.0.3) | ||
| 27 | builder (~> 3.1.0) | 27 | builder (~> 3.1.0) |
| 28 | - activerecord (4.0.2) | ||
| 29 | - activemodel (= 4.0.2) | 28 | + activerecord (4.0.3) |
| 29 | + activemodel (= 4.0.3) | ||
| 30 | activerecord-deprecated_finders (~> 1.0.2) | 30 | activerecord-deprecated_finders (~> 1.0.2) |
| 31 | - activesupport (= 4.0.2) | 31 | + activesupport (= 4.0.3) |
| 32 | arel (~> 4.0.0) | 32 | arel (~> 4.0.0) |
| 33 | activerecord-deprecated_finders (1.0.3) | 33 | activerecord-deprecated_finders (1.0.3) |
| 34 | - activesupport (4.0.2) | 34 | + activesupport (4.0.3) |
| 35 | i18n (~> 0.6, >= 0.6.4) | 35 | i18n (~> 0.6, >= 0.6.4) |
| 36 | minitest (~> 4.2) | 36 | minitest (~> 4.2) |
| 37 | multi_json (~> 1.3) | 37 | multi_json (~> 1.3) |
| @@ -43,7 +43,7 @@ GEM | @@ -43,7 +43,7 @@ GEM | ||
| 43 | annotate (2.6.0) | 43 | annotate (2.6.0) |
| 44 | activerecord (>= 2.3.0) | 44 | activerecord (>= 2.3.0) |
| 45 | rake (>= 0.8.7) | 45 | rake (>= 0.8.7) |
| 46 | - arel (4.0.1) | 46 | + arel (4.0.2) |
| 47 | asciidoctor (0.1.4) | 47 | asciidoctor (0.1.4) |
| 48 | atomic (1.1.14) | 48 | atomic (1.1.14) |
| 49 | awesome_print (1.2.0) | 49 | awesome_print (1.2.0) |
| @@ -320,7 +320,7 @@ GEM | @@ -320,7 +320,7 @@ GEM | ||
| 320 | cliver (~> 0.2.1) | 320 | cliver (~> 0.2.1) |
| 321 | multi_json (~> 1.0) | 321 | multi_json (~> 1.0) |
| 322 | websocket-driver (>= 0.2.0) | 322 | websocket-driver (>= 0.2.0) |
| 323 | - polyglot (0.3.3) | 323 | + polyglot (0.3.4) |
| 324 | posix-spawn (0.3.8) | 324 | posix-spawn (0.3.8) |
| 325 | protected_attributes (1.0.5) | 325 | protected_attributes (1.0.5) |
| 326 | activemodel (>= 4.0.1, < 5.0) | 326 | activemodel (>= 4.0.1, < 5.0) |
| @@ -346,13 +346,13 @@ GEM | @@ -346,13 +346,13 @@ GEM | ||
| 346 | rack | 346 | rack |
| 347 | rack-test (0.6.2) | 347 | rack-test (0.6.2) |
| 348 | rack (>= 1.0) | 348 | rack (>= 1.0) |
| 349 | - rails (4.0.2) | ||
| 350 | - actionmailer (= 4.0.2) | ||
| 351 | - actionpack (= 4.0.2) | ||
| 352 | - activerecord (= 4.0.2) | ||
| 353 | - activesupport (= 4.0.2) | 349 | + rails (4.0.3) |
| 350 | + actionmailer (= 4.0.3) | ||
| 351 | + actionpack (= 4.0.3) | ||
| 352 | + activerecord (= 4.0.3) | ||
| 353 | + activesupport (= 4.0.3) | ||
| 354 | bundler (>= 1.3.0, < 2.0) | 354 | bundler (>= 1.3.0, < 2.0) |
| 355 | - railties (= 4.0.2) | 355 | + railties (= 4.0.3) |
| 356 | sprockets-rails (~> 2.0.0) | 356 | sprockets-rails (~> 2.0.0) |
| 357 | rails-observers (0.1.2) | 357 | rails-observers (0.1.2) |
| 358 | activemodel (~> 4.0) | 358 | activemodel (~> 4.0) |
| @@ -365,13 +365,13 @@ GEM | @@ -365,13 +365,13 @@ GEM | ||
| 365 | i18n | 365 | i18n |
| 366 | require_all | 366 | require_all |
| 367 | ruby-progressbar | 367 | ruby-progressbar |
| 368 | - railties (4.0.2) | ||
| 369 | - actionpack (= 4.0.2) | ||
| 370 | - activesupport (= 4.0.2) | 368 | + railties (4.0.3) |
| 369 | + actionpack (= 4.0.3) | ||
| 370 | + activesupport (= 4.0.3) | ||
| 371 | rake (>= 0.8.7) | 371 | rake (>= 0.8.7) |
| 372 | thor (>= 0.18.1, < 2.0) | 372 | thor (>= 0.18.1, < 2.0) |
| 373 | raindrops (0.12.0) | 373 | raindrops (0.12.0) |
| 374 | - rake (10.1.0) | 374 | + rake (10.1.1) |
| 375 | raphael-rails (2.1.2) | 375 | raphael-rails (2.1.2) |
| 376 | rb-fsevent (0.9.3) | 376 | rb-fsevent (0.9.3) |
| 377 | rb-inotify (0.9.2) | 377 | rb-inotify (0.9.2) |