diff options
| author | José Valim <jose.valim@gmail.com> | 2010-04-26 09:36:13 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-04-26 09:36:13 +0200 |
| commit | e461e1bc0ec0a5c365840031309b83143e12955a (patch) | |
| tree | 11c2d270ec0fcd5de79d460b095161c073791cde /railties/lib | |
| parent | c9132c149cb9fe5628c2e947434e8c58acdaa709 (diff) | |
| download | rails-e461e1bc0ec0a5c365840031309b83143e12955a.tar.gz rails-e461e1bc0ec0a5c365840031309b83143e12955a.tar.bz2 rails-e461e1bc0ec0a5c365840031309b83143e12955a.zip | |
Ensure application rake tasks and generators are loaded after the ones specified in railties/engines/rails. [#4471 state:resolved]
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails/tasks/documentation.rake | 2 | ||||
| -rw-r--r-- | railties/lib/rails/test_unit/testing.rake | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 38a5aa8ca3..7cec14c738 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -112,15 +112,15 @@ module Rails def load_tasks initialize_tasks - super railties.all { |r| r.load_tasks } + super self end def load_generators initialize_generators - super railties.all { |r| r.load_generators } + super self end diff --git a/railties/lib/rails/tasks/documentation.rake b/railties/lib/rails/tasks/documentation.rake index 957c375f6a..19d1fd2354 100644 --- a/railties/lib/rails/tasks/documentation.rake +++ b/railties/lib/rails/tasks/documentation.rake @@ -1,3 +1,5 @@ +require 'rake/rdoctask' + namespace :doc do def gem_path(gem_name) path = $LOAD_PATH.grep(/#{gem_name}[\w.-]*\/lib$/).first diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake index 83f25506cb..f69a1169d9 100644 --- a/railties/lib/rails/test_unit/testing.rake +++ b/railties/lib/rails/test_unit/testing.rake @@ -1,3 +1,5 @@ +require 'rake/testtask' + TEST_CHANGES_SINCE = Time.now - 600 # Look up tests for recently modified sources. |