aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators/named_base.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2012-10-15 10:20:50 -0500
committerJoshua Peek <josh@joshpeek.com>2012-10-15 10:20:50 -0500
commitc800e27ad35ec46f32b5ac4428e5cf7141f95105 (patch)
tree0821e0afaba2a74dec6ea1397ee3cabfd3d10c59 /railties/lib/rails/generators/named_base.rb
parent7dba1599d9092a8362956a3fab23b2c60eedea63 (diff)
parent46dc6e7786222865309d15a9eaaaf55e3b7d9c1f (diff)
downloadrails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.gz
rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.tar.bz2
rails-c800e27ad35ec46f32b5ac4428e5cf7141f95105.zip
Merge branch 'master' into asset-path-helper
Conflicts: railties/test/application/configuration_test.rb
Diffstat (limited to 'railties/lib/rails/generators/named_base.rb')
-rw-r--r--railties/lib/rails/generators/named_base.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index b61a5fc69d..84f8f76838 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -5,9 +5,9 @@ require 'rails/generators/generated_attribute'
module Rails
module Generators
class NamedBase < Base
- argument :name, :type => :string
- class_option :skip_namespace, :type => :boolean, :default => false,
- :desc => "Skip namespace (affects only isolated applications)"
+ argument :name, type: :string
+ class_option :skip_namespace, type: :boolean, default: false,
+ desc: "Skip namespace (affects only isolated applications)"
def initialize(args, *options) #:nodoc:
@inside_template = nil
@@ -169,7 +169,7 @@ module Rails
#
# ==== Examples
#
- # check_class_collision :suffix => "Observer"
+ # check_class_collision suffix: "Observer"
#
# If the generator is invoked with class name Admin, it will check for
# the presence of "AdminObserver".