diff options
| -rw-r--r-- | railties/CHANGELOG.md | 9 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index c797eacd0b..7a68cf0a2e 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,8 +1,13 @@ ## Rails 4.0.0 (unreleased) ## +* Engines with a dummy app include the rake tasks of dependencies in the app namespace. + Fix #8229 + + *Yves Senn* + * Add sqlserver.yml template file to satisfy '-d sqlserver' being passed to 'rails new'. - Fix #6882 - + Fix #6882 + *Robert Nesius* * Rake test:uncommitted finds git directory in ancestors *Nicolas Despres* diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb b/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb index 8a8ba04a70..310c975262 100644 --- a/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb +++ b/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb @@ -11,7 +11,7 @@ require "action_mailer/railtie" <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie" <% end -%> -Bundler.require +Bundler.require(*Rails.groups) require "<%= name %>" <%= application_definition %> |