Merge commit 'rails/master'

Conflicts:
	activerecord/lib/active_record/associations.rb

1 files changed, 0 insertions, 25 deletions

diff --git a/railties/lib/rails_generator/generators/components/helper/helper_generator.rb b/railties/lib/rails_generator/generators/components/helper/helper_generator.rb
deleted file mode 100644
index f7831f7c7a..0000000000
--- a/railties/lib/rails_generator/generators/components/helper/helper_generator.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-class HelperGenerator < Rails::Generator::NamedBase
-  def manifest
-    record do |m|
-      # Check for class naming collisions.
-      m.class_collisions class_path, "#{class_name}Helper", "#{class_name}HelperTest"
-
-      # Helper and helper test directories.
-      m.directory File.join('app/helpers', class_path)
-      m.directory File.join('test/unit/helpers', class_path)
-
-      # Helper and helper test class.
-
-      m.template 'helper.rb',
-                  File.join('app/helpers',
-                            class_path,
-                            "#{file_name}_helper.rb")
-
-      m.template 'helper_test.rb',
-                  File.join('test/unit/helpers',
-                            class_path,
-                            "#{file_name}_helper_test.rb")
-
-    end
-  end
-end