diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-11-27 11:31:17 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-11-27 11:31:17 +0000 |
| commit | 3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf (patch) | |
| tree | 4960911c58f2c47ecaf4f4579167270ba9c257a7 /railties/lib/rails/commands.rb | |
| parent | 1bc90044b655572a4b8aa3b323905e26d37e0f2b (diff) | |
| parent | fd83f9d51583c080072dc9fd00f02ad742e265d4 (diff) | |
| download | rails-3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf.tar.gz rails-3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf.tar.bz2 rails-3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf.zip | |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/CHANGELOG
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'railties/lib/rails/commands.rb')
| -rw-r--r-- | railties/lib/rails/commands.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/railties/lib/rails/commands.rb b/railties/lib/rails/commands.rb index de5d876c18..338565247f 100644 --- a/railties/lib/rails/commands.rb +++ b/railties/lib/rails/commands.rb @@ -12,11 +12,8 @@ command = aliases[command] || command case command when 'generate', 'destroy', 'plugin' - if command == "plugin" && ARGV.first == "new" + if command == 'plugin' && ARGV.first == 'new' require "rails/commands/plugin_new" - elsif command == 'generate' && ARGV.first == "plugin_new" - puts "This generator should not be used directly as a generator. You should use `rails plugin new` command instead" - exit(1) else require APP_PATH Rails.application.require_environment! |