Download as
Browse Code »

Commit 51d5e4cd6e109d2e0972f36b5f73d2af9966f827

Authored by Marin Jankovski
1 parent a727d25e
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Bump to Rails 4.1.

Showing 2 changed files with 53 additions and 48 deletions   Show diff stats
Gemfile
  Diff comments   View file @51d5e4c
... ... @@ -8,7 +8,7 @@ def linux_only(require_as)
8 8 RUBY_PLATFORM.include?('linux') && require_as
9 9 end
10 10  
11   -gem "rails", "~> 4.0.0"
  11 +gem "rails", "~> 4.1.0"
12 12  
13 13 gem "protected_attributes"
14 14 gem 'rails-observers'
... ... @@ -207,7 +207,7 @@ group :development, :test do
207 207 gem 'factory_girl_rails'
208 208  
209 209 # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826)
210   - gem 'minitest', '~> 4.7.0'
  210 + gem 'minitest', '~> 5.3.0'
211 211  
212 212 # Generate Fake data
213 213 gem "ffaker"
... ...
Gemfile.lock
  Diff comments   View file @51d5e4c
... ... @@ -2,37 +2,39 @@ GEM
2 2 remote: https://rubygems.org/
3 3 specs:
4 4 ace-rails-ap (2.0.1)
5   - actionmailer (4.0.5)
6   - actionpack (= 4.0.5)
  5 + actionmailer (4.1.1)
  6 + actionpack (= 4.1.1)
  7 + actionview (= 4.1.1)
7 8 mail (~> 2.5.4)
8   - actionpack (4.0.5)
9   - activesupport (= 4.0.5)
10   - builder (~> 3.1.0)
11   - erubis (~> 2.7.0)
  9 + actionpack (4.1.1)
  10 + actionview (= 4.1.1)
  11 + activesupport (= 4.1.1)
12 12 rack (~> 1.5.2)
13 13 rack-test (~> 0.6.2)
14   - activemodel (4.0.5)
15   - activesupport (= 4.0.5)
16   - builder (~> 3.1.0)
17   - activerecord (4.0.5)
18   - activemodel (= 4.0.5)
19   - activerecord-deprecated_finders (~> 1.0.2)
20   - activesupport (= 4.0.5)
21   - arel (~> 4.0.0)
22   - activerecord-deprecated_finders (1.0.3)
23   - activesupport (4.0.5)
  14 + actionview (4.1.1)
  15 + activesupport (= 4.1.1)
  16 + builder (~> 3.1)
  17 + erubis (~> 2.7.0)
  18 + activemodel (4.1.1)
  19 + activesupport (= 4.1.1)
  20 + builder (~> 3.1)
  21 + activerecord (4.1.1)
  22 + activemodel (= 4.1.1)
  23 + activesupport (= 4.1.1)
  24 + arel (~> 5.0.0)
  25 + activesupport (4.1.1)
24 26 i18n (~> 0.6, >= 0.6.9)
25   - minitest (~> 4.2)
26   - multi_json (~> 1.3)
  27 + json (~> 1.7, >= 1.7.7)
  28 + minitest (~> 5.1)
27 29 thread_safe (~> 0.1)
28   - tzinfo (~> 0.3.37)
  30 + tzinfo (~> 1.1)
29 31 acts-as-taggable-on (2.4.1)
30 32 rails (>= 3, < 5)
31 33 addressable (2.3.5)
32 34 annotate (2.6.0)
33 35 activerecord (>= 2.3.0)
34 36 rake (>= 0.8.7)
35   - arel (4.0.2)
  37 + arel (5.0.1.20140414130214)
36 38 asciidoctor (0.1.4)
37 39 awesome_print (1.2.0)
38 40 axiom-types (0.0.5)
... ... @@ -46,7 +48,7 @@ GEM
46 48 debug_inspector (>= 0.0.1)
47 49 bootstrap-sass (3.0.3.0)
48 50 sass (~> 3.2)
49   - builder (3.1.4)
  51 + builder (3.2.2)
50 52 capybara (2.2.1)
51 53 mime-types (>= 1.16)
52 54 nokogiri (>= 1.3.3)
... ... @@ -223,13 +225,13 @@ GEM
223 225 guard-spinach (0.0.2)
224 226 guard (>= 1.1)
225 227 spinach
226   - haml (4.0.4)
  228 + haml (4.0.5)
227 229 tilt
228   - haml-rails (0.5.1)
229   - actionpack (~> 4.0.0)
230   - activesupport (~> 4.0.0)
  230 + haml-rails (0.5.3)
  231 + actionpack (>= 4.0.1)
  232 + activesupport (>= 4.0.1)
231 233 haml (>= 3.1, < 5.0)
232   - railties (~> 4.0.0)
  234 + railties (>= 4.0.1)
233 235 hashie (2.0.5)
234 236 hike (1.2.3)
235 237 hipchat (0.14.0)
... ... @@ -282,7 +284,7 @@ GEM
282 284 method_source (0.8.2)
283 285 mime-types (1.25.1)
284 286 mini_portile (0.6.0)
285   - minitest (4.7.5)
  287 + minitest (5.3.4)
286 288 multi_json (1.10.1)
287 289 multi_xml (0.5.5)
288 290 multipart-post (1.2.0)
... ... @@ -355,14 +357,16 @@ GEM
355 357 rack
356 358 rack-test (0.6.2)
357 359 rack (>= 1.0)
358   - rails (4.0.5)
359   - actionmailer (= 4.0.5)
360   - actionpack (= 4.0.5)
361   - activerecord (= 4.0.5)
362   - activesupport (= 4.0.5)
  360 + rails (4.1.1)
  361 + actionmailer (= 4.1.1)
  362 + actionpack (= 4.1.1)
  363 + actionview (= 4.1.1)
  364 + activemodel (= 4.1.1)
  365 + activerecord (= 4.1.1)
  366 + activesupport (= 4.1.1)
363 367 bundler (>= 1.3.0, < 2.0)
364   - railties (= 4.0.5)
365   - sprockets-rails (~> 2.0.0)
  368 + railties (= 4.1.1)
  369 + sprockets-rails (~> 2.0)
366 370 rails-observers (0.1.2)
367 371 activemodel (~> 4.0)
368 372 rails_best_practices (1.14.4)
... ... @@ -374,13 +378,13 @@ GEM
374 378 i18n
375 379 require_all
376 380 ruby-progressbar
377   - railties (4.0.5)
378   - actionpack (= 4.0.5)
379   - activesupport (= 4.0.5)
  381 + railties (4.1.1)
  382 + actionpack (= 4.1.1)
  383 + activesupport (= 4.1.1)
380 384 rake (>= 0.8.7)
381 385 thor (>= 0.18.1, < 2.0)
382 386 raindrops (0.12.0)
383   - rake (10.3.1)
  387 + rake (10.3.2)
384 388 raphael-rails (2.1.2)
385 389 rb-fsevent (0.9.3)
386 390 rb-inotify (0.9.2)
... ... @@ -443,9 +447,9 @@ GEM
443 447 sdoc (0.3.20)
444 448 json (>= 1.1.3)
445 449 rdoc (~> 3.10)
446   - seed-fu (2.3.0)
447   - activerecord (>= 3.1, < 4.1)
448   - activesupport (>= 3.1, < 4.1)
  450 + seed-fu (2.3.1)
  451 + activerecord (>= 3.1, < 4.2)
  452 + activesupport (>= 3.1, < 4.2)
449 453 select2-rails (3.5.2)
450 454 thor (~> 0.14)
451 455 settingslogic (2.0.9)
... ... @@ -491,7 +495,7 @@ GEM
491 495 multi_json (~> 1.0)
492 496 rack (~> 1.0)
493 497 tilt (~> 1.1, != 1.3.0)
494   - sprockets-rails (2.0.1)
  498 + sprockets-rails (2.1.3)
495 499 actionpack (>= 3.0)
496 500 activesupport (>= 3.0)
497 501 sprockets (~> 2.8)
... ... @@ -510,7 +514,7 @@ GEM
510 514 eventmachine (>= 1.0.0)
511 515 rack (>= 1.0.0)
512 516 thor (0.19.1)
513   - thread_safe (0.3.3)
  517 + thread_safe (0.3.4)
514 518 tilt (1.4.1)
515 519 timers (1.1.0)
516 520 tinder (1.9.3)
... ... @@ -532,7 +536,8 @@ GEM
532 536 eventmachine (>= 0.12.8)
533 537 http_parser.rb (~> 0.5.1)
534 538 simple_oauth (~> 0.1.4)
535   - tzinfo (0.3.39)
  539 + tzinfo (1.2.0)
  540 + thread_safe (~> 0.1)
536 541 uglifier (2.3.2)
537 542 execjs (>= 0.3.0)
538 543 json (>= 1.8.0)
... ... @@ -621,7 +626,7 @@ DEPENDENCIES
621 626 kaminari (~> 0.15.1)
622 627 launchy
623 628 letter_opener
624   - minitest (~> 4.7.0)
  629 + minitest (~> 5.3.0)
625 630 mysql2
626 631 nprogress-rails
627 632 omniauth (~> 1.1.3)
... ... @@ -637,7 +642,7 @@ DEPENDENCIES
637 642 rack-attack
638 643 rack-cors
639 644 rack-mini-profiler
640   - rails (~> 4.0.0)
  645 + rails (~> 4.1.0)
641 646 rails-observers
642 647 rails_best_practices
643 648 raphael-rails (~> 2.1.2)
... ...