diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2010-12-15 13:08:49 +0100 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2010-12-16 01:49:30 +0530 |
| commit | 875bbd58b4175a1219c5f7615946d0b89e51182d (patch) | |
| tree | 4fedc789567dacca6d1145cb8d7616f87080730b /railties/lib | |
| parent | bb89f8613abdfa562445519c0dca901e2231a6bf (diff) | |
| download | rails-875bbd58b4175a1219c5f7615946d0b89e51182d.tar.gz rails-875bbd58b4175a1219c5f7615946d0b89e51182d.tar.bz2 rails-875bbd58b4175a1219c5f7615946d0b89e51182d.zip | |
AppGenerator: use options instead of @options
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 94af9fe1e9..3f6ff35a86 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -63,7 +63,7 @@ module Rails end def database_yml - template "config/databases/#{@options[:database]}.yml", "config/database.yml" + template "config/databases/#{options[:database]}.yml", "config/database.yml" end def db @@ -106,8 +106,8 @@ module Rails empty_directory "public/javascripts" unless options[:skip_javascript] - copy_file "public/javascripts/#{@options[:javascript]}.js" - copy_file "public/javascripts/#{@options[:javascript]}_ujs.js", "public/javascripts/rails.js" + copy_file "public/javascripts/#{options[:javascript]}.js" + copy_file "public/javascripts/#{options[:javascript]}_ujs.js", "public/javascripts/rails.js" if options[:javascript] == "prototype" copy_file "public/javascripts/controls.js" |