aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJon Moss <me@jonathanmoss.me>2016-03-12 11:14:37 -0500
committerJon Moss <me@jonathanmoss.me>2016-03-12 11:14:37 -0500
commit5ae26e1eeccef9e90850fff9b2395d41bed3462f (patch)
tree0047b6eef0b051474e0ce5da05ec83f51c6da924 /railties
parent9201030320d09bb2ec76a7cc59aa58f77f984995 (diff)
downloadrails-5ae26e1eeccef9e90850fff9b2395d41bed3462f.tar.gz
rails-5ae26e1eeccef9e90850fff9b2395d41bed3462f.tar.bz2
rails-5ae26e1eeccef9e90850fff9b2395d41bed3462f.zip
Un-hide helper and assets options for controller generator
These options were hidden via 9b36cf0fa4cbdcb2e2072ef1b8179a98b13efce3, but these options have tests written for them, and I believe that they are supposed to be public API. Fixes #24168.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/controller/controller_generator.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/rails/controller/controller_generator.rb b/railties/lib/rails/generators/rails/controller/controller_generator.rb
index 0a4c509a31..6c583e5811 100644
--- a/railties/lib/rails/generators/rails/controller/controller_generator.rb
+++ b/railties/lib/rails/generators/rails/controller/controller_generator.rb
@@ -19,8 +19,7 @@ module Rails
end
end
- hook_for :template_engine, :test_framework
- hook_for :helper, :assets, hide: true
+ hook_for :template_engine, :test_framework, :helper, :assets
private