diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-08 09:44:36 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-08 09:44:36 -0700 |
| commit | 0e4d16f78f0bb08fa1e8351be97f984f1a5e4f58 (patch) | |
| tree | 3199eb657a66ab2e701aed7e8e01104c8bc11c70 /railties/lib | |
| parent | dfb1ebe63d78703747a515cca53b044cd1a52e4b (diff) | |
| parent | 8b1d475f9667e9ecc7478e8a01de912cca2a4497 (diff) | |
| download | rails-0e4d16f78f0bb08fa1e8351be97f984f1a5e4f58.tar.gz rails-0e4d16f78f0bb08fa1e8351be97f984f1a5e4f58.tar.bz2 rails-0e4d16f78f0bb08fa1e8351be97f984f1a5e4f58.zip | |
Merge pull request #6678 from arunagw/fix_issue_6673
Fix issue 6673
Diffstat (limited to 'railties/lib')
| -rwxr-xr-x | railties/lib/rails/generators/rails/plugin_new/templates/Rakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile index 6ed6adcf1b..564fda3c49 100755 --- a/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile +++ b/railties/lib/rails/generators/rails/plugin_new/templates/Rakefile @@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc| rdoc.rdoc_files.include('lib/**/*.rb') end -<% if full? && !options[:skip_active_record] -%> +<% if full? && !options[:skip_active_record] && !options[:skip_test_unit] -%> APP_RAKEFILE = File.expand_path("../<%= dummy_path -%>/Rakefile", __FILE__) load 'rails/tasks/engine.rake' <% end %> |