diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-11 09:40:39 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-06-11 14:43:09 -0300 |
commit | 0391ae9a14af1a87ca435eb7777c73271e859ae0 (patch) | |
tree | fce44aa88f270328a9312b5cedbfeca2c0d7226d /railties/lib/rails | |
parent | c9f27e3a479e17cd94248c007e4f528026bc18f6 (diff) | |
download | rails-0391ae9a14af1a87ca435eb7777c73271e859ae0.tar.gz rails-0391ae9a14af1a87ca435eb7777c73271e859ae0.tar.bz2 rails-0391ae9a14af1a87ca435eb7777c73271e859ae0.zip |
Merge pull request #6690 from suginoy/fix-templates-copy
Fix: 'rake rails:templates:copy' doesn't work
Conflicts:
railties/test/application/rake_test.rb
Diffstat (limited to 'railties/lib/rails')
-rw-r--r-- | railties/lib/rails/tasks/framework.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/tasks/framework.rake b/railties/lib/rails/tasks/framework.rake index 206ce39773..f9cff5b627 100644 --- a/railties/lib/rails/tasks/framework.rake +++ b/railties/lib/rails/tasks/framework.rake @@ -20,7 +20,7 @@ namespace :rails do project_templates = "#{Rails.root}/lib/templates" default_templates = { "erb" => %w{controller mailer scaffold}, - "rails" => %w{controller helper scaffold_controller stylesheets} } + "rails" => %w{controller helper scaffold_controller assets} } default_templates.each do |type, names| local_template_type_dir = File.join(project_templates, type) |