Update sass-rails with newer version of rails.

ad5a982d · Marin Jankovski · Jacob Vosmaer · 5014a5b7 · ad5a982d · ad5a982d
Commit ad5a982d authored May 08, 2014 by Marin Jankovski Committed by Jacob Vosmaer May 08, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +7 -6

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -152,7 +152,7 @@ gem "rack-attack"
 # Ace editor
 gem 'ace-rails-ap'
-gem "sass-rails"
+gem "sass-rails", '~> 4.0.2'
 gem "coffee-rails"
 gem "uglifier"
 gem "therubyracer"

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -427,11 +427,12 @@ GEM
    safe_yaml (0.9.7)
    sanitize (2.1.0)
      nokogiri (>= 1.4.4)
-    sass (3.2.12)
+    sass (3.2.19)
-    sass-rails (4.0.1)
+    sass-rails (4.0.3)
      railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
+      sass (~> 3.2.0)
-      sprockets-rails (~> 2.0.0)
+      sprockets (~> 2.8, <= 2.11.0)
+      sprockets-rails (~> 2.0)
    sdoc (0.3.20)
      json (>= 1.1.3)
      rdoc (~> 3.10)
@@ -478,7 +479,7 @@ GEM
      spring (>= 0.9.1)
    spring-commands-spinach (1.0.0)
      spring (>= 0.9.1)
-    sprockets (2.12.1)
+    sprockets (2.11.0)
      hike (~> 1.2)
      multi_json (~> 1.0)
      rack (~> 1.0)
@@ -636,7 +637,7 @@ DEPENDENCIES
  redis-rails
  rspec-rails
  sanitize (~> 2.0)
-  sass-rails
+  sass-rails (~> 4.0.2)
  sdoc
  seed-fu
  select2-rails