diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rwxr-xr-x | railties/bin/generate | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index f5f8e3296a..043b9edfa3 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added support for a -h/--help parameter in the generator #331 [Ulysses] + * File.expand_path in config/environment.rb would fail when dealing with symlinked public directories [mjobin]. diff --git a/railties/bin/generate b/railties/bin/generate index 8f2f1497d6..1588a306da 100755 --- a/railties/bin/generate +++ b/railties/bin/generate @@ -2,6 +2,8 @@ require File.dirname(__FILE__) + '/../config/environment' require 'rails_generator' +ARGV.shift unless ARGV.empty? or not ['--help', '-h'].include?(ARGV[0]) + unless ARGV.empty? begin name = ARGV.shift |