Download as
Browse Code »

Commit 5218537c3bff9e26f657fd0f8c773471a5170d9b

Authored by Dmitriy Zaporozhets
2 parents e5de0068 ad5a982d
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'rails_4_0_5' into 'master' 

Rails 4.0.5
Showing 2 changed files with 29 additions and 28 deletions   Show diff stats
Gemfile
  Diff comments   View file @5218537
... ... @@ -152,7 +152,7 @@ gem "rack-attack"
152 152 # Ace editor
153 153 gem 'ace-rails-ap'
154 154  
155   -gem "sass-rails"
  155 +gem "sass-rails", '~> 4.0.2'
156 156 gem "coffee-rails"
157 157 gem "uglifier"
158 158 gem "therubyracer"
... ...
Gemfile.lock
  Diff comments   View file @5218537
... ... @@ -2,26 +2,26 @@ GEM
2 2 remote: https://rubygems.org/
3 3 specs:
4 4 ace-rails-ap (2.0.1)
5   - actionmailer (4.0.3)
6   - actionpack (= 4.0.3)
  5 + actionmailer (4.0.5)
  6 + actionpack (= 4.0.5)
7 7 mail (~> 2.5.4)
8   - actionpack (4.0.3)
9   - activesupport (= 4.0.3)
  8 + actionpack (4.0.5)
  9 + activesupport (= 4.0.5)
10 10 builder (~> 3.1.0)
11 11 erubis (~> 2.7.0)
12 12 rack (~> 1.5.2)
13 13 rack-test (~> 0.6.2)
14   - activemodel (4.0.3)
15   - activesupport (= 4.0.3)
  14 + activemodel (4.0.5)
  15 + activesupport (= 4.0.5)
16 16 builder (~> 3.1.0)
17   - activerecord (4.0.3)
18   - activemodel (= 4.0.3)
  17 + activerecord (4.0.5)
  18 + activemodel (= 4.0.5)
19 19 activerecord-deprecated_finders (~> 1.0.2)
20   - activesupport (= 4.0.3)
  20 + activesupport (= 4.0.5)
21 21 arel (~> 4.0.0)
22 22 activerecord-deprecated_finders (1.0.3)
23   - activesupport (4.0.3)
24   - i18n (~> 0.6, >= 0.6.4)
  23 + activesupport (4.0.5)
  24 + i18n (~> 0.6, >= 0.6.9)
25 25 minitest (~> 4.2)
26 26 multi_json (~> 1.3)
27 27 thread_safe (~> 0.1)
... ... @@ -279,7 +279,7 @@ GEM
279 279 mime-types (1.25.1)
280 280 mini_portile (0.5.3)
281 281 minitest (4.7.5)
282   - multi_json (1.9.3)
  282 + multi_json (1.10.0)
283 283 multi_xml (0.5.5)
284 284 multipart-post (1.2.0)
285 285 mysql2 (0.3.11)
... ... @@ -349,13 +349,13 @@ GEM
349 349 rack
350 350 rack-test (0.6.2)
351 351 rack (>= 1.0)
352   - rails (4.0.3)
353   - actionmailer (= 4.0.3)
354   - actionpack (= 4.0.3)
355   - activerecord (= 4.0.3)
356   - activesupport (= 4.0.3)
  352 + rails (4.0.5)
  353 + actionmailer (= 4.0.5)
  354 + actionpack (= 4.0.5)
  355 + activerecord (= 4.0.5)
  356 + activesupport (= 4.0.5)
357 357 bundler (>= 1.3.0, < 2.0)
358   - railties (= 4.0.3)
  358 + railties (= 4.0.5)
359 359 sprockets-rails (~> 2.0.0)
360 360 rails-observers (0.1.2)
361 361 activemodel (~> 4.0)
... ... @@ -368,9 +368,9 @@ GEM
368 368 i18n
369 369 require_all
370 370 ruby-progressbar
371   - railties (4.0.3)
372   - actionpack (= 4.0.3)
373   - activesupport (= 4.0.3)
  371 + railties (4.0.5)
  372 + actionpack (= 4.0.5)
  373 + activesupport (= 4.0.5)
374 374 rake (>= 0.8.7)
375 375 thor (>= 0.18.1, < 2.0)
376 376 raindrops (0.12.0)
... ... @@ -427,11 +427,12 @@ GEM
427 427 safe_yaml (0.9.7)
428 428 sanitize (2.1.0)
429 429 nokogiri (>= 1.4.4)
430   - sass (3.2.12)
431   - sass-rails (4.0.1)
  430 + sass (3.2.19)
  431 + sass-rails (4.0.3)
432 432 railties (>= 4.0.0, < 5.0)
433   - sass (>= 3.1.10)
434   - sprockets-rails (~> 2.0.0)
  433 + sass (~> 3.2.0)
  434 + sprockets (~> 2.8, <= 2.11.0)
  435 + sprockets-rails (~> 2.0)
435 436 sdoc (0.3.20)
436 437 json (>= 1.1.3)
437 438 rdoc (~> 3.10)
... ... @@ -478,7 +479,7 @@ GEM
478 479 spring (>= 0.9.1)
479 480 spring-commands-spinach (1.0.0)
480 481 spring (>= 0.9.1)
481   - sprockets (2.10.1)
  482 + sprockets (2.11.0)
482 483 hike (~> 1.2)
483 484 multi_json (~> 1.0)
484 485 rack (~> 1.0)
... ... @@ -636,7 +637,7 @@ DEPENDENCIES
636 637 redis-rails
637 638 rspec-rails
638 639 sanitize (~> 2.0)
639   - sass-rails
  640 + sass-rails (~> 4.0.2)
640 641 sdoc
641 642 seed-fu
642 643 select2-rails
... ...