Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into stable

  • Loading branch information...
commit 2daf95113833877ffbccfe00c3c681ee27c80273 2 parents e884242 + 47d889a
Chris Eppstein chriseppstein authored
Showing with 3 additions and 2 deletions.
  1. +2 −1  lib/compass-rails.rb
  2. +1 −1  lib/compass-rails/version.rb
3  lib/compass-rails.rb
View
@@ -12,7 +12,8 @@ module CompassRails
extend self
def load_rails
- return if defined?(::Rails) && !::Rails.application.nil?
+ return if defined?(::Rails) && ::Rails.respond_to?(:application) && !::Rails.application.nil?
+
rails_config_path = Dir.pwd
until File.exists?(File.join(rails_config_path, 'config', 'application.rb')) do
raise 'Rails application not found' if rails_config_path == '/'
2  lib/compass-rails/version.rb
View
@@ -1,5 +1,5 @@
module CompassRails
unless defined?(::CompassRails::VERSION)
- VERSION = "1.0.0.rc.2"
+ VERSION = "1.0.0.rc.3"
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.