Merge pull request twbs#106 from htanata/rails_2_3

DocX · Apr 8, 2012 · 644623a · 644623a
2 parents 85e4cbd + 711f3b3
commit 644623a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/bootstrap-sass.rb b/lib/bootstrap-sass.rb
@@ -3,7 +3,7 @@ class FrameworkNotFound < StandardError; end
 
   # Inspired by Kaminari
   def self.load!
-    if rails?
+    if rails_asset_pipeline?
       require 'sass-rails' # See: https://github.com/thomas-mcdonald/bootstrap-sass/pull/4
       require 'bootstrap-sass/engine'
       require 'bootstrap-sass/config/sass_extentions'
@@ -21,13 +21,13 @@ def self.load!
   end
 
   private
-  def self.rails?
-    defined?(::Rails)
+  def self.rails_asset_pipeline?
+    defined?(::Rails) && ::Rails.version >= '3.1.0'
   end
 
   def self.compass?
     defined?(::Compass)
   end
 end
 
-Bootstrap.load!
+Bootstrap.load!