aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2017-11-07 14:33:48 +0900
committerGitHub <noreply@github.com>2017-11-07 14:33:48 +0900
commit52d60ec46c9eba98423acfce2680e76bdc1cab36 (patch)
tree21bbdd3ca2d175be0d784ed8bbf1197a8b742f5d
parenta8590da4bb4a3d8222800704c82cbfe755b8594a (diff)
parent38158451103be572d6e81e971797938df7bd22ea (diff)
downloadrails-52d60ec46c9eba98423acfce2680e76bdc1cab36.tar.gz
rails-52d60ec46c9eba98423acfce2680e76bdc1cab36.tar.bz2
rails-52d60ec46c9eba98423acfce2680e76bdc1cab36.zip
Merge pull request #31076 from y-yagi/fix_comment_in_check_class_collision
Fix comment in `check_class_collision` [ci skip]
-rw-r--r--railties/lib/rails/generators/named_base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/named_base.rb b/railties/lib/rails/generators/named_base.rb
index 60625283ac..99165168fd 100644
--- a/railties/lib/rails/generators/named_base.rb
+++ b/railties/lib/rails/generators/named_base.rb
@@ -221,7 +221,7 @@ module Rails
#
def self.check_class_collision(options = {}) # :doc:
define_method :check_class_collision do
- name = if respond_to?(:controller_class_name) # for ScaffoldBase
+ name = if respond_to?(:controller_class_name) # for ResourceHelpers
controller_class_name
else
class_name