Tidy up generators commits.

2 files changed, 2 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!
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 240810b8bd..27a4007c20 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -228,6 +228,7 @@ module Rails
       rails = groups.delete("rails")
       rails.map! { |n| n.sub(/^rails:/, '') }
       rails.delete("app")
+      rails.delete("plugin_new")
       print_list("rails", rails)
 
       hidden_namespaces.each {|n| groups.delete(n.to_s) }