diff options
| author | Yves Senn <yves.senn@gmail.com> | 2012-11-18 17:57:55 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2012-11-18 18:03:27 +0100 |
| commit | a1fd9cd1a0ecd88517febf9c9d0ca85fd07ebe25 (patch) | |
| tree | 7cfa7b438977f1f91b0368ad191a97da24ef9109 /railties | |
| parent | 7cb0c8852b4196ab92cfb7cb1f08dc5ff8084bf4 (diff) | |
| download | rails-a1fd9cd1a0ecd88517febf9c9d0ca85fd07ebe25.tar.gz rails-a1fd9cd1a0ecd88517febf9c9d0ca85fd07ebe25.tar.bz2 rails-a1fd9cd1a0ecd88517febf9c9d0ca85fd07ebe25.zip | |
require bundler groups to include rake-tasks in engines
If you generate a full engine, this will include rake tasks from
your gem under the `app` namespace. For example if you have a dependency
on `rspec-rails` in your engine's `gemspec`. You will get the task `app:spec`
Closes #8229
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index 20032eac9b..7a68cf0a2e 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,5 +1,10 @@ ## 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 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 %> |