From bc81f5ff43f61a47f978f8d131c5d57667ba4181 Mon Sep 17 00:00:00 2001
From: Marnen Laibow-Koser <marnen@marnen.org>
Date: Thu, 1 Sep 2011 16:38:47 -0400
Subject: [PATCH] Temporarily downgrade Haml so we can use sass-convert to get
 stuff out of sass2 format. [#53]

---
 Gemfile                     | 4 ++--
 Gemfile.lock                | 6 ++----
 vendor/plugins/haml/init.rb | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index f4845171..65ec2596 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
 gem 'rails', '~> 2.3.5'
-gem 'haml', '>= 2.1.0'
-gem 'sass'
+gem 'haml', '~> 3.0.0'
+# gem 'sass'
 gem 'postgres'
 gem 'fast_gettext'
 gem 'prawn'
diff --git a/Gemfile.lock b/Gemfile.lock
index 74d037ea..0eccf6ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -32,7 +32,7 @@ GEM
       i18n (~> 0.4)
     fast_gettext (0.4.17)
     gettext (2.0.0)
-    haml (3.1.2)
+    haml (3.0.25)
     i18n (0.6.0)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
@@ -65,7 +65,6 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    sass (3.1.7)
     term-ansicolor (1.0.6)
     treetop (1.4.10)
       polyglot
@@ -87,7 +86,7 @@ DEPENDENCIES
   faker
   fast_gettext
   gettext (>= 1.9.3)
-  haml (>= 2.1.0)
+  haml (~> 3.0.0)
   machinist (>= 1.0.3)
   postgres
   prawn
@@ -95,5 +94,4 @@ DEPENDENCIES
   rdiscount (>= 1.2.11)
   rspec-rails (~> 1.3.2)
   ruby-debug
-  sass
   webrat (>= 0.4.3)
diff --git a/vendor/plugins/haml/init.rb b/vendor/plugins/haml/init.rb
index f8b3dab1..3b64a9e0 100644
--- a/vendor/plugins/haml/init.rb
+++ b/vendor/plugins/haml/init.rb
@@ -13,6 +13,6 @@
   end
 end
 
-# Load Haml.
+# Load Haml and Sass.
 # Haml may be undefined if we're running gems:install.
 Haml.init_rails(binding) if defined?(Haml)