github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix typo in 5b5730cc6e

Browse Source
This commit is contained in:
Pratik Naik
2008-11-24 19:35:09 +01:00
parent 5b5730cc6e
commit b7568e77d7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
railties/CHANGELOG
View File

@@ -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]

8
railties/lib/rails_generator/generators/applications/app/app_generator.rb
View File

@@ -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",