Permalink
Browse files

Merge branch 'stable' of github.com:Compass/compass-rails into stable

  • Loading branch information...
2 parents 093feb3 + 652c967 commit aaac769b177ff2fd6ebf6a17d0c7e03125903651 @scottdavis scottdavis committed Feb 2, 2012
Showing with 2 additions and 20 deletions.
  1. +2 −2 Gemfile
  2. +0 −18 lib/compass/app_integration/rails.rb
View
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
gemspec
group :assets do
- gem 'compass', :git => 'git://github.com/chriseppstein/compass.git', :branch => :master
+ gem 'compass'
gem 'compass-rails', :path => '.'
end
@@ -19,4 +19,4 @@ unless ENV["CI"]
gem 'ruby_gntp', :require => false
gem 'guard'
gem 'guard-test'
-end
+end
@@ -1,18 +0,0 @@
-module Compass
- module AppIntegration
- module Rails
- extend self
- def initialize!
- Compass::Util.compass_warn("WARNING: Please remove the call to Compass::AppIntegration::Rails.initialize! from #{caller[0].sub(/:.*$/,'')};\nWARNING: This is done automatically now. If this is default compass initializer you can just remove the file.")
- end
- def root
- Compass::Util.compass_warn("WARNING: Please remove the call to Compass::AppIntegration::Rails.root from #{caller[0].sub(/:.*$/,'')};\nWARNING: This is done automatically now. If this is default compass initializer you can just remove the file.")
- ::Rails.root
- end
- def env
- Compass::Util.compass_warn("WARNING: Please remove the call to Compass::AppIntegration::Rails.env from #{caller[0].sub(/:.*$/,'')};\nWARNING: This is done automatically now. If this is default compass initializer you can just remove the file.")
- ::Rails.env
- end
- end
- end
-end

0 comments on commit aaac769

Please sign in to comment.