diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-11-24 19:35:09 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-11-24 19:35:09 +0100 |
| commit | b7568e77d79cba9202b961cbe2a822b8b6b34bb0 (patch) | |
| tree | 0a7e65055c91f03f5fe4696458b28412e3481772 /railties | |
| parent | 5b5730cc6e9194fb5f67fe79d2c7849e200ba6ed (diff) | |
| download | rails-b7568e77d79cba9202b961cbe2a822b8b6b34bb0.tar.gz rails-b7568e77d79cba9202b961cbe2a822b8b6b34bb0.tar.bz2 rails-b7568e77d79cba9202b961cbe2a822b8b6b34bb0.zip | |
Fix typo in 5b5730cc6e9194fb5f67fe79d2c7849e200ba6ed
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index bf185d1bda..1dba7a009e 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,6 +1,6 @@ *2.3.0 [Edge]* -* "rails <app>" will not generate public/dispatch.cgi/fcgi/rb files by default now. Please use "--with-dispatches" option if you need them. [Yaroslav Markin, Pratik Naik] +* "rails <app>" will not generate public/dispatch.cgi/fcgi/rb files by default now. Please use "--with-dispatchers" option if you need them. [Yaroslav Markin, Pratik Naik] * Added rake rails:update:application_controller to renamed application.rb to application_controller.rb -- included in rake rails:update so upgrading to 2.3 will automatically trigger it #1439 [kastner] diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb index 892dba20b0..32383d2bbd 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -10,7 +10,7 @@ class AppGenerator < Rails::Generator::Base DEFAULT_DATABASE = 'sqlite3' default_options :db => (ENV["RAILS_DEFAULT_DATABASE"] || DEFAULT_DATABASE), - :shebang => DEFAULT_SHEBANG, :with_dispatches => false, :freeze => false + :shebang => DEFAULT_SHEBANG, :with_dispatchers => false, :freeze => false mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.." def initialize(runtime_args, runtime_options = {}) @@ -83,7 +83,7 @@ class AppGenerator < Rails::Generator::Base end # Dispatches - if options[:with_dispatches] + if options[:with_dispatchers] m.file "dispatches/dispatch.rb", "public/dispatch.rb", dispatcher_options m.file "dispatches/dispatch.rb", "public/dispatch.cgi", dispatcher_options m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", dispatcher_options @@ -131,9 +131,9 @@ class AppGenerator < Rails::Generator::Base "Preconfigure for selected database (options: #{DATABASES.join('/')}).", "Default: #{DEFAULT_DATABASE}") { |v| options[:db] = v } - opt.on("-D", "--with-dispatches", + opt.on("-D", "--with-dispatchers", "Add CGI/FastCGI/mod_ruby dispatches code to generated application skeleton", - "Default: false") { |v| options[:with_dispatches] = v } + "Default: false") { |v| options[:with_dispatchers] = v } opt.on("-f", "--freeze", "Freeze Rails in vendor/rails from the gems generating the skeleton", |