diff options
author | Ahmed El-Daly <aeldaly@developergurus.com> | 2009-01-29 23:04:49 -0500 |
---|---|---|
committer | Ahmed El-Daly <aeldaly@developergurus.com> | 2009-01-29 23:04:49 -0500 |
commit | 43d63298f7693a437b454b4b8ee84946af350572 (patch) | |
tree | 55166f7c3118061a1fd0df2cb3cf6ea6e31647b9 /railties/lib/tasks | |
parent | 6623e4f92a69c2aa0a12957db430b00690d50d19 (diff) | |
parent | 24b688d31d34dc7582c8e2ac4347d0c36e3c5e10 (diff) | |
download | rails-43d63298f7693a437b454b4b8ee84946af350572.tar.gz rails-43d63298f7693a437b454b4b8ee84946af350572.tar.bz2 rails-43d63298f7693a437b454b4b8ee84946af350572.zip |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'railties/lib/tasks')
-rw-r--r-- | railties/lib/tasks/gems.rake | 4 | ||||
-rw-r--r-- | railties/lib/tasks/misc.rake | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/tasks/gems.rake b/railties/lib/tasks/gems.rake index 754e3ba5c9..e6731ab78c 100644 --- a/railties/lib/tasks/gems.rake +++ b/railties/lib/tasks/gems.rake @@ -17,13 +17,13 @@ end namespace :gems do task :base do - $rails_gem_installer = true + $rails_rake_task = true Rake::Task[:environment].invoke end desc "Build any native extensions for unpacked gems" task :build do - $rails_gem_installer = true + $rails_rake_task = true require 'rails/gem_builder' Dir[File.join(Rails::GemDependency.unpacked_path, '*')].each do |gem_dir| spec_file = File.join(gem_dir, '.specification') diff --git a/railties/lib/tasks/misc.rake b/railties/lib/tasks/misc.rake index 411750bf40..9e6f96db5b 100644 --- a/railties/lib/tasks/misc.rake +++ b/railties/lib/tasks/misc.rake @@ -1,5 +1,6 @@ task :default => :test task :environment do + $rails_rake_task = true require(File.join(RAILS_ROOT, 'config', 'environment')) end |