Download as
Browse Code »

Commit ad5a982d841f572e4e9207ae5ac6a0013648d30e

Authored by Marin Jankovski
Committed by Jacob Vosmaer
1 parent 5014a5b7
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Update sass-rails with newer version of rails.

Showing 2 changed files with 8 additions and 7 deletions   Show diff stats
Gemfile
  Diff comments   View file @ad5a982
... ... @@ -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 @ad5a982
... ... @@ -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.12.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
... ...