diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-28 16:21:30 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-28 16:21:30 +0200 |
| commit | 7d56fd9f08795e7dddac9d31b34d707b83023c6b (patch) | |
| tree | 4df3575138f3606d602ad9746f46da697913cd78 /railties | |
| parent | d9aae2b56e64a4f417eaffa99e10cca274e928e7 (diff) | |
| download | rails-7d56fd9f08795e7dddac9d31b34d707b83023c6b.tar.gz rails-7d56fd9f08795e7dddac9d31b34d707b83023c6b.tar.bz2 rails-7d56fd9f08795e7dddac9d31b34d707b83023c6b.zip | |
Always use application generator to run templates.
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/generators/rails/app/app_generator.rb | 1 | ||||
| -rw-r--r-- | railties/lib/tasks/framework.rake | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/generators/rails/app/app_generator.rb b/railties/lib/generators/rails/app/app_generator.rb index 0c9bbeb847..c8044d13b1 100644 --- a/railties/lib/generators/rails/app/app_generator.rb +++ b/railties/lib/generators/rails/app/app_generator.rb @@ -176,7 +176,6 @@ module Rails::Generators protected # Define file as an alias to create_file for backwards compatibility. - # TODO Add deprecation warning? # def file(*args, &block) create_file(*args, &block) diff --git a/railties/lib/tasks/framework.rake b/railties/lib/tasks/framework.rake index 72cba5ce8b..a084af7e11 100644 --- a/railties/lib/tasks/framework.rake +++ b/railties/lib/tasks/framework.rake @@ -86,7 +86,7 @@ namespace :rails do template = File.expand_path(template) if template !~ %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://} require 'generators' - generator = Rails::Generators::Base.new [], {}, :destination_root => RAILS_ROOT + generator = Rails::Generators::App.new [ RAILS_ROOT ], {}, :destination_root => RAILS_ROOT generator.apply template, :verbose => false end |