Skip to content

Commit

Permalink
Temporarily downgrade Haml so we can use sass-convert to get stuff ou…
Browse files Browse the repository at this point in the history
…t of sass2 format. [#53]
  • Loading branch information
marnen committed Sep 1, 2011
1 parent b8f49dd commit bc81f5f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
4 changes: 2 additions & 2 deletions 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'
Expand Down
6 changes: 2 additions & 4 deletions Gemfile.lock
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -87,13 +86,12 @@ DEPENDENCIES
faker
fast_gettext
gettext (>= 1.9.3)
haml (>= 2.1.0)
haml (~> 3.0.0)
machinist (>= 1.0.3)
postgres
prawn
rails (~> 2.3.5)
rdiscount (>= 1.2.11)
rspec-rails (~> 1.3.2)
ruby-debug
sass
webrat (>= 0.4.3)
2 changes: 1 addition & 1 deletion vendor/plugins/haml/init.rb
Expand Up @@ -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)

0 comments on commit bc81f5f

Please sign in to comment.