diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2010-02-04 13:14:44 +0000 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2010-02-04 13:14:44 +0000 |
commit | 8260f0b40f8954f1822a0f856f7c0706afbba0bd (patch) | |
tree | 1ec6fe65274eeb87c2030ba2daa3e230a375e846 /railties/lib/rails/generators/base.rb | |
parent | 6241d4e5535190b817e546130cfe179b641da1ba (diff) | |
parent | 6d6e6105c074eb9f266619e77a0873635af94124 (diff) | |
download | rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.tar.gz rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.tar.bz2 rails-8260f0b40f8954f1822a0f856f7c0706afbba0bd.zip |
Merge remote branch 'mainstream/master'
Conflicts:
railties/guides/source/3_0_release_notes.textile
Diffstat (limited to 'railties/lib/rails/generators/base.rb')
-rw-r--r-- | railties/lib/rails/generators/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/base.rb b/railties/lib/rails/generators/base.rb index f4b2bd1ae9..dfa0d573c9 100644 --- a/railties/lib/rails/generators/base.rb +++ b/railties/lib/rails/generators/base.rb @@ -1,4 +1,4 @@ -require 'thor' +require 'thor/group' require 'rails/generators/actions' module Rails @@ -261,7 +261,7 @@ module Rails # Use Rails default banner. # def self.banner - "#{$0} #{generator_name} #{self.arguments.map{ |a| a.usage }.join(' ')} [options]" + "rails generate #{generator_name} #{self.arguments.map{ |a| a.usage }.join(' ')} [options]" end # Sets the base_name taking into account the current class namespace. |