updated to rails 2.3.8 and ruby 1.9

tomcz · Aug 16, 2010 · 1f6677a · 1f6677a
1 parent b80b6c0
commit 1f6677a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/config/environment.rb b/config/environment.rb
@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

diff --git a/vendor/plugins/haml/init.rb b/vendor/plugins/haml/init.rb
@@ -7,7 +7,9 @@
     # 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:install')
+    raise e unless defined?(Rake) &&
+      (Rake.application.top_level_tasks.include?('gems') ||
+        Rake.application.top_level_tasks.include?('gems:install'))
   end
 end