aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2019-03-19 16:37:14 -0400
committerGitHub <noreply@github.com>2019-03-19 16:37:14 -0400
commitf88ea5fd7413c01796707626c890927088b88cd8 (patch)
tree514d679cf3139db5374aaba4d976e17821eb6e49 /railties
parentfbc2e670f1ae64a5eeeee876b71cf325616d0578 (diff)
parentd82839b0eec704e9ddf278fe886448f2059d693b (diff)
downloadrails-f88ea5fd7413c01796707626c890927088b88cd8.tar.gz
rails-f88ea5fd7413c01796707626c890927088b88cd8.tar.bz2
rails-f88ea5fd7413c01796707626c890927088b88cd8.zip
Merge pull request #35656 from larouxn/revert-34277-remove-javascripts-javascripts_engine-options-for-generators
Revert "Remove `javascripts` and `javascript_engine` options for generators"
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index b835b3f3fd..77b7e7766f 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -56,6 +56,8 @@ module Rails
force_plural: false,
helper: true,
integration_tool: nil,
+ javascripts: true,
+ javascript_engine: :js,
orm: false,
resource_controller: :controller,
resource_route: true,