aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-05-21 12:50:54 -0300
committerRafael França <rafaelmfranca@gmail.com>2016-05-21 12:50:54 -0300
commit6fda365658917b0401ae25a0f3847160a771cb1a (patch)
tree7b827380f783c78d403bad1d306600c2bc3558d7 /railties/lib
parentcf403266e500e62daca398a97039d889b8cd4517 (diff)
parent5ae26e1eeccef9e90850fff9b2395d41bed3462f (diff)
downloadrails-6fda365658917b0401ae25a0f3847160a771cb1a.tar.gz
rails-6fda365658917b0401ae25a0f3847160a771cb1a.tar.bz2
rails-6fda365658917b0401ae25a0f3847160a771cb1a.zip
Merge pull request #24170 from maclover7/fix-24168
Un-hide helper and assets options for controller generator
Diffstat (limited to 'railties/lib')
-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