diff options
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/bin/destroy | 2 | ||||
| -rwxr-xr-x | railties/bin/generate | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 7e0a4311f0..6d6a447f74 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed -h/--help for generate and destroy generators #331 + * Added begin/rescue around the FCGI dispatcher so no uncaught exceptions can bubble up to kill the process (logs to log/fastcgi.crash.log) * Fixed that association#count would produce invalid sql when called sequentialy #659 [kanis@comcard.de] diff --git a/railties/bin/destroy b/railties/bin/destroy index ba6dc7703f..f9d9d181a4 100644 --- a/railties/bin/destroy +++ b/railties/bin/destroy @@ -2,4 +2,6 @@ require File.dirname(__FILE__) + '/../config/environment' require 'rails_generator' require 'rails_generator/scripts/destroy' + +ARGV.shift if ['--help', '-h'].include?(ARGV[0]) Rails::Generator::Scripts::Destroy.new.run(ARGV) diff --git a/railties/bin/generate b/railties/bin/generate index dde69e61a1..43bcfd0cb1 100755 --- a/railties/bin/generate +++ b/railties/bin/generate @@ -2,4 +2,6 @@ require File.dirname(__FILE__) + '/../config/environment' require 'rails_generator' require 'rails_generator/scripts/generate' + +ARGV.shift if ['--help', '-h'].include?(ARGV[0]) Rails::Generator::Scripts::Generate.new.run(ARGV) |