From 5fa732cd0bfa0fdac557399306446bdb7a89a97f Mon Sep 17 00:00:00 2001 From: Alinson S Xavier Date: Thu, 11 Jul 2013 16:51:00 -0400 Subject: [PATCH] Upgrading to Rails 2.3.4 and Haml 2.2.24 --- config/environment.rb | 1 - vendor/plugins/haml/init.rb | 16 +++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/config/environment.rb b/config/environment.rb index 288a9ba..d0dbdb4 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -75,7 +75,6 @@ Rails::Initializer.run do |config| config.gem "dr_nic_magic_models" config.gem "bluecloth" - config.gem "acts_as_versioned" config.gem "haml" config.gem "hpricot" config.gem "icalendar" diff --git a/vendor/plugins/haml/init.rb b/vendor/plugins/haml/init.rb index 7cd9a05..3b64a9e 100644 --- a/vendor/plugins/haml/init.rb +++ b/vendor/plugins/haml/init.rb @@ -1,8 +1,18 @@ begin require File.join(File.dirname(__FILE__), 'lib', 'haml') # From here rescue LoadError - require 'haml' # From gem + 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 end -# Load Haml and Sass -Haml.init_rails(binding) +# Load Haml and Sass. +# Haml may be undefined if we're running gems:install. +Haml.init_rails(binding) if defined?(Haml)