Permalink
Browse files

Merge pull request #1317 from parndt/3-0-stable

This fixes rake for me in RefineryCMS.
  • Loading branch information...
2 parents 8b0806e + 9e88b87 commit 072e1ca5ea70d746189be360c64270b13c745bc3 @tenderlove tenderlove committed May 26, 2011
Showing with 5 additions and 7 deletions.
  1. +5 −6 railties/lib/rails/application.rb
  2. +0 −1 railties/lib/rails/railtie.rb
View
11 railties/lib/rails/application.rb
@@ -211,12 +211,11 @@ def default_middleware_stack
end
def initialize_tasks
- self.class.rake_tasks do
- require "rails/tasks"
- task :environment do
- $rails_rake_task = true
- require_environment!
- end
+ extend Rake::DSL if defined? Rake::DSL
+ require "rails/tasks"
+ task :environment do
+ $rails_rake_task = true
+ require_environment!
end
end
View
1 railties/lib/rails/railtie.rb
@@ -181,7 +181,6 @@ def load_console
end
def load_tasks
- extend Rake::DSL if defined? Rake::DSL
self.class.rake_tasks.each(&:call)
end

0 comments on commit 072e1ca

Please sign in to comment.