aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/Rakefile2
-rwxr-xr-xrailties/fresh_rakefile3
-rw-r--r--railties/lib/rails_generator/generators/applications/app/app_generator.rb1
4 files changed, 7 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 90b7e240e0..d22c7e32bf 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Make the default rakefile read *.rake files from config/tasks (for easy extension of the rakefile by e.g. generators)
+
* Only load breakpoint in development mode and when BREAKPOINT_SERVER_PORT is defined.
* Allow the --toggle-spin switch on process/reaper to be negated
diff --git a/railties/Rakefile b/railties/Rakefile
index 4aa932faa2..e086c76ed6 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -26,7 +26,7 @@ RUBY_FORGE_USER = "webster132"
# end
-BASE_DIRS = %w( app config/environments components db doc log lib public script script/process test vendor )
+BASE_DIRS = %w( app config/environments config/tasks components db doc log lib public script script/process test vendor )
APP_DIRS = %w( apis models controllers helpers views views/layouts )
PUBLIC_DIRS = %w( images javascripts stylesheets )
TEST_DIRS = %w( fixtures unit functional mocks mocks/development mocks/test )
diff --git a/railties/fresh_rakefile b/railties/fresh_rakefile
index 34b0d24c4d..4e557d53ac 100755
--- a/railties/fresh_rakefile
+++ b/railties/fresh_rakefile
@@ -219,3 +219,6 @@ task :load_fixtures => :environment do
Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*'))
end
end
+
+# Load any custom rakefile extensions
+Dir["./config/tasks/**/*.rake"].each { |ext| load ext }
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 7750d563d3..e8a3decffd 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -106,6 +106,7 @@ class AppGenerator < Rails::Generator::Base
app/models
app/views/layouts
config/environments
+ config/tasks
components
db
doc