aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2016-10-27 20:13:55 +0900
committerAkira Matsuda <ronnie@dio.jp>2016-10-28 13:00:08 +0900
commita36ef6ee3ed44e6ce1636f12da59c473dddd94bb (patch)
treed23c78116fc6bb23119015a8f094fab22a74da52 /railties
parent9339011ad1fe5fc0865b1c0b4da206c4132cd3ab (diff)
downloadrails-a36ef6ee3ed44e6ce1636f12da59c473dddd94bb.tar.gz
rails-a36ef6ee3ed44e6ce1636f12da59c473dddd94bb.tar.bz2
rails-a36ef6ee3ed44e6ce1636f12da59c473dddd94bb.zip
Explicitly show --no-helper and --no-assets options in help message
I'm sorry for causing #24168. I wasn't aware of --no-helper and --no-assets. So I'm adding them to the help message. I'm still not sure how to show `--no-test-framework` though.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/controller/controller_generator.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb
index 213de37cce..ced3c85c00 100644
--- a/railties/lib/rails/generators/rails/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb
@@ -3,6 +3,8 @@ module Rails
class ControllerGenerator < NamedBase # :nodoc:
argument :actions, type: :array, default: [], banner: "action action"
class_option :skip_routes, type: :boolean, desc: "Don't add routes to config/routes.rb."
+ class_option :helper, type: :boolean
+ class_option :assets, type: :boolean
check_class_collision suffix: "Controller"