diff options
| author | Yves Senn <yves.senn@gmail.com> | 2012-11-18 17:57:55 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@garaio.com> | 2012-11-19 15:23:49 +0100 |
| commit | da6951af63b311cf6c0e92ee09301820a620aa3d (patch) | |
| tree | 24cbbb29a4f98e3c022a1a02ec4de980c7963b8e /railties | |
| parent | b18fc59d28d96ba4d3481a71030b56f643653f3c (diff) | |
| download | rails-da6951af63b311cf6c0e92ee09301820a620aa3d.tar.gz rails-da6951af63b311cf6c0e92ee09301820a620aa3d.tar.bz2 rails-da6951af63b311cf6c0e92ee09301820a620aa3d.zip | |
backport #8262, 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
Conflicts:
railties/CHANGELOG.md
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 0096e4f8f8..9110fdc673 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,5 +1,10 @@ ## Rails 3.2.9 (Nov 12, 2012) ## +* Engines with a dummy app include the rake tasks of dependencies in the app namespace. [Backport: #8262] + Fix #8229 + + *Yves Senn* + * Add dummy app Rake tasks when --skip-test-unit and --dummy-path is passed to the plugin generator. [Backport #8139] Fix #8121 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 996ea79e67..6cb7e38b56 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 @@ -12,7 +12,7 @@ require "active_resource/railtie" <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie" <% end -%> -Bundler.require +Bundler.require(*Rails.groups) require "<%= name %>" <%= application_definition %> |