Update sass-rails to 3.1.4

quicktwit · Jul 23, 2012 · a3f66a5 · a3f66a5
1 parent bc23166
commit a3f66a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,9 @@ gem 'rails', '3.1.6'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails', "  ~> 3.1.0"
+  # Lock sass-rails at 3.1.4 because of an issue in sass-rails 3.1.5 & 6
+  # https://github.com/rails/sass-rails/issues/78
+  gem 'sass-rails', "= 3.1.4"
   gem 'compass-rails', "~> 1.0.3"
   gem 'coffee-rails', "~> 3.1.0"
   gem 'uglifier', "~> 1.0.0"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -254,10 +254,12 @@ GEM
     rubyntlm (0.1.1)
     rubyzip (0.9.9)
     sass (3.1.7)
-    sass-rails (3.1.0)
+    sass-rails (3.1.4)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
       sass (>= 3.1.4)
+      sprockets (~> 2.0.0)
+      tilt (~> 1.3.2)
     selenium-webdriver (2.25.0)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
@@ -340,7 +342,7 @@ DEPENDENCIES
   redfinger (~> 0.1.0)
   rocco!
   rsa (~> 0.1.4)
-  sass-rails (~> 3.1.0)
+  sass-rails (= 3.1.4)
   show_me_the_cookies (~> 1.1.0)
   simplecov (~> 0.4.0)
   twitter (~> 1.6.2)