aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/lib/rails/generators/erb.rb4
-rw-r--r--railties/lib/rails/generators/erb/controller/controller_generator.rb6
-rw-r--r--railties/lib/rails/generators/erb/mailer/mailer_generator.rb6
-rw-r--r--railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb6
-rw-r--r--railties/lib/rails/generators/js/assets/assets_generator.rb4
-rw-r--r--railties/lib/rails/generators/rails/helper/helper_generator.rb2
6 files changed, 14 insertions, 14 deletions
diff --git a/railties/lib/rails/generators/erb.rb b/railties/lib/rails/generators/erb.rb
index aa824499ac..73e986ee7f 100644
--- a/railties/lib/rails/generators/erb.rb
+++ b/railties/lib/rails/generators/erb.rb
@@ -1,7 +1,7 @@
require 'rails/generators/named_base'
-module Erb # :nodoc:
- module Generators # :nodoc:
+module Erb # :nodoc:
+ module Generators # :nodoc:
class Base < Rails::Generators::NamedBase #:nodoc:
protected
diff --git a/railties/lib/rails/generators/erb/controller/controller_generator.rb b/railties/lib/rails/generators/erb/controller/controller_generator.rb
index e14cb09ff7..89e6361f93 100644
--- a/railties/lib/rails/generators/erb/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/erb/controller/controller_generator.rb
@@ -1,8 +1,8 @@
require 'rails/generators/erb'
-module Erb # :nodoc:
- module Generators # :nodoc:
- class ControllerGenerator < Base # :nodoc:
+module Erb # :nodoc:
+ module Generators # :nodoc:
+ class ControllerGenerator < Base # :nodoc:
argument :actions, :type => :array, :default => [], :banner => "action action"
def copy_view_files
diff --git a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
index 89de2a4be5..7bcac30dde 100644
--- a/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
+++ b/railties/lib/rails/generators/erb/mailer/mailer_generator.rb
@@ -1,8 +1,8 @@
require 'rails/generators/erb/controller/controller_generator'
-module Erb # :nodoc:
- module Generators # :nodoc:
- class MailerGenerator < ControllerGenerator # :nodoc:
+module Erb # :nodoc:
+ module Generators # :nodoc:
+ class MailerGenerator < ControllerGenerator # :nodoc:
protected
def format
diff --git a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb
index 19fc53aeee..54ed648df4 100644
--- a/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails/generators/erb/scaffold/scaffold_generator.rb
@@ -1,9 +1,9 @@
require 'rails/generators/erb'
require 'rails/generators/resource_helpers'
-module Erb # :nodoc:
- module Generators # :nodoc:
- class ScaffoldGenerator < Base # :nodoc:
+module Erb # :nodoc:
+ module Generators # :nodoc:
+ class ScaffoldGenerator < Base # :nodoc:
include Rails::Generators::ResourceHelpers
argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
diff --git a/railties/lib/rails/generators/js/assets/assets_generator.rb b/railties/lib/rails/generators/js/assets/assets_generator.rb
index 82f40de009..1e925b2cd2 100644
--- a/railties/lib/rails/generators/js/assets/assets_generator.rb
+++ b/railties/lib/rails/generators/js/assets/assets_generator.rb
@@ -1,8 +1,8 @@
require "rails/generators/named_base"
module Js # :nodoc:
- module Generators # :nodoc:
- class AssetsGenerator < Rails::Generators::NamedBase # :nodoc:
+ module Generators # :nodoc:
+ class AssetsGenerator < Rails::Generators::NamedBase # :nodoc:
source_root File.expand_path("../templates", __FILE__)
def copy_javascript
diff --git a/railties/lib/rails/generators/rails/helper/helper_generator.rb b/railties/lib/rails/generators/rails/helper/helper_generator.rb
index 0975ab3903..a1f83ac3e4 100644
--- a/railties/lib/rails/generators/rails/helper/helper_generator.rb
+++ b/railties/lib/rails/generators/rails/helper/helper_generator.rb
@@ -1,6 +1,6 @@
module Rails
module Generators
- class HelperGenerator < NamedBase # :nodoc:
+ class HelperGenerator < NamedBase # :nodoc:
check_class_collision :suffix => "Helper"
def create_helper_files