From 5eb7b7edb89ebe0fd287f12da61847b8a60ea08c Mon Sep 17 00:00:00 2001
From: Nicolae Claudius <claudius.nicolae@gmail.com>
Date: Tue, 15 Oct 2013 16:46:52 +0300
Subject: [PATCH] compass rails 4 issue

---
 Gemfile      |  2 +-
 Gemfile.lock | 39 ++++++++++++++++-----------------------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/Gemfile b/Gemfile
index d0f3b67..863e5bd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem 'acts_as_nested_interval', '~> 0.1.0'
 gem 'seedbank', '~> 0.3.0.pre2', github: 'james2m/seedbank'
 gem 'unicorn', '~> 4.6.3'
 gem 'sass-rails', '~> 4.0.0'
-gem 'compass-rails', github: 'milgner/compass-rails', branch: 'rails4'
+gem 'compass-rails', '~> 2.0.alpha.0'
 gem 'bootstrap-sass', github: 'thomas-mcdonald/bootstrap-sass', branch: '3'
 gem 'webshims-rails', '~> 1.11.1'
 gem 'detect_timezone_rails', '~> 0.0.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3fec814..40b7ba2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,7 +6,7 @@ GIT
 
 GIT
   remote: git://github.com/activescaffold/active_scaffold.git
-  revision: b52d88de7385fe1370382a776a6c7be0aa592651
+  revision: 34cd6608c059c1816e68cb7b8c22c5bf1d04891f
   specs:
     active_scaffold (3.4.0.rc)
       rails (>= 3.2.6, < 5)
@@ -31,27 +31,19 @@ GIT
   specs:
     userstamp (2.0.2)
 
-GIT
-  remote: git://github.com/milgner/compass-rails.git
-  revision: c86e7fd9c2605c80816a2f64a3fb8b7c3a09e494
-  branch: rails4
-  specs:
-    compass-rails (1.0.3)
-      compass (>= 0.12.2, < 0.14)
-
 GIT
   remote: git://github.com/plataformatec/mail_form.git
-  revision: 9eb221a9c5e3f6dad631a547c7518fc0d1cde070
+  revision: 3b15e8c4fb4607556879419db8956965805a0a76
   specs:
-    mail_form (1.5.0.rc)
+    mail_form (1.5.0)
       actionmailer (>= 3.2, < 5)
       activemodel (>= 3.2, < 5)
 
 GIT
   remote: git://github.com/plataformatec/simple_form.git
-  revision: f0b95cb9805ebc895947cafaf33a07b67eeb8c71
+  revision: 50c4ac4a8bd0cb883ddaa309b779978e4207fef4
   specs:
-    simple_form (3.0.0.rc)
+    simple_form (3.0.0)
       actionpack (>= 4.0.0, < 4.1)
       activemodel (>= 4.0.0, < 4.1)
 
@@ -126,10 +118,12 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
+    compass-rails (2.0.alpha.0)
+      compass (>= 0.12.2, < 0.14)
     concerned_with (0.1.0)
     dalli (2.6.4)
-    database_rewinder (0.0.1)
-    debase (0.0.7)
+    database_rewinder (0.0.2)
+    debase (0.0.8)
       debugger-ruby_core_source
     debug_inspector (0.0.2)
     debugger-ruby_core_source (1.2.3)
@@ -142,7 +136,7 @@ GEM
       warden (~> 1.2.3)
     diff-lcs (1.2.4)
     erubis (2.7.0)
-    execjs (2.0.1)
+    execjs (2.0.2)
     factory_girl (4.2.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.2.1)
@@ -156,8 +150,7 @@ GEM
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.0.4)
-      jquery-rails
+    jquery-ui-rails (4.0.5)
       railties (>= 3.1.0)
     json (1.8.0)
     kgio (2.8.1)
@@ -168,7 +161,7 @@ GEM
     mime-types (1.25)
     mini_portile (0.5.1)
     minitest (4.7.5)
-    multi_json (1.8.0)
+    multi_json (1.8.2)
     mysql2 (0.3.13)
     nilify_blanks (1.0.2)
       activerecord (>= 3.0.0)
@@ -208,7 +201,7 @@ GEM
     rake (10.1.0)
     ref (1.0.5)
     rspec-core (2.14.5)
-    rspec-expectations (2.14.2)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
     rspec-rails (2.14.0)
@@ -220,7 +213,7 @@ GEM
       rspec-mocks (~> 2.14.0)
     ruby-debug-ide (0.4.18)
       rake (>= 0.8.1)
-    sass (3.2.10)
+    sass (3.2.12)
     sass-rails (4.0.0)
       railties (>= 4.0.0.beta, < 5.0)
       sass (>= 3.1.10)
@@ -253,7 +246,7 @@ GEM
       polyglot (>= 0.3.1)
     turbolinks (1.3.0)
       coffee-rails
-    tzinfo (0.3.37)
+    tzinfo (0.3.38)
     uglifier (2.2.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
@@ -282,7 +275,7 @@ DEPENDENCIES
   cancan (= 1.6.7)
   capybara (~> 2.1.0)
   coffee-rails (~> 4.0.0)
-  compass-rails!
+  compass-rails (~> 2.0.alpha.0)
   concerned_with (~> 0.1.0)
   dalli (~> 2.6.2)
   database_rewinder (~> 0.0.1)