Load generators from both lib/rails/generators and lib/generators. Using the former since it's less obstrusive.

1 files changed, 0 insertions, 41 deletions

diff --git a/railties/lib/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/generators/erb/scaffold/scaffold_generator.rb
deleted file mode 100644
index 267c9c8063..0000000000
--- a/railties/lib/generators/erb/scaffold/scaffold_generator.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-require 'generators/erb'
-require 'rails/generators/resource_helpers'
-
-module Erb
-  module Generators
-    class ScaffoldGenerator < Base
-      include Rails::Generators::ResourceHelpers
-
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-
-      class_option :layout,    :type => :boolean
-      class_option :singleton, :type => :boolean, :desc => "Supply to skip index view"
-
-      def create_root_folder
-        empty_directory File.join("app/views", controller_file_path)
-      end
-
-      def copy_view_files
-        views = available_views
-        views.delete("index") if options[:singleton]
-
-        views.each do |view|
-          filename = filename_with_extensions(view)
-          template filename, File.join("app/views", controller_file_path, filename)
-        end
-      end
-
-      def copy_layout_file
-        return unless options[:layout]
-        template filename_with_extensions(:layout),
-          File.join("app/views/layouts", controller_class_path, filename_with_extensions(controller_file_name))
-      end
-
-    protected
-
-      def available_views
-        %w(index edit show new _form)
-      end
-    end
-  end
-end