Created
May 26, 2010 20:56
-
-
Save jaydonnell/415040 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/vendor/plugins/haml/init.rb b/vendor/plugins/haml/init.rb | |
index 3b64a9e..7cd9a05 100644 | |
--- a/vendor/plugins/haml/init.rb | |
+++ b/vendor/plugins/haml/init.rb | |
@@ -1,18 +1,8 @@ | |
begin | |
require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here | |
rescue LoadError | |
- begin | |
- require 'haml' # From gem | |
- rescue LoadError => e | |
- # gems:install may be run to install Haml with the skeleton plugin | |
- # but not the gem itself installed. | |
- # Don't die if this is the case. | |
- raise e unless defined?(Rake) && | |
- (Rake.application.top_level_tasks.include?('gems') || | |
- Rake.application.top_level_tasks.include?('gems:install')) | |
- end | |
+ require 'haml' # From gem | |
end | |
-# Load Haml and Sass. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment