aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas La Roux <larouxn@gmail.com>2019-03-20 09:48:51 +0900
committerGitHub <noreply@github.com>2019-03-20 09:48:51 +0900
commit49f4625b70ea4d4831ad3f32930642548d62fe5e (patch)
tree73b063e8a98cef8e122261b0542c300d880d652f
parenta207b9422762429ea365c519beaacf965df24cb9 (diff)
downloadrails-49f4625b70ea4d4831ad3f32930642548d62fe5e.tar.gz
rails-49f4625b70ea4d4831ad3f32930642548d62fe5e.tar.bz2
rails-49f4625b70ea4d4831ad3f32930642548d62fe5e.zip
Revert "Revert "Remove `javascripts` and `javascript_engine` options for generators""
-rw-r--r--guides/source/configuring.md2
-rw-r--r--railties/lib/rails/generators.rb2
2 files changed, 0 insertions, 4 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 54a74dd649..a61ba5dc9f 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -204,8 +204,6 @@ The full set of methods that can be used in this block are as follows:
* `helper` defines whether or not to generate helpers. Defaults to `true`.
* `integration_tool` defines which integration tool to use to generate integration tests. Defaults to `:test_unit`.
* `system_tests` defines which integration tool to use to generate system tests. Defaults to `:test_unit`.
-* `javascripts` turns on the hook for JavaScript files in generators. Used in Rails for when the `scaffold` generator is run. Defaults to `true`.
-* `javascript_engine` configures the engine to be used (for eg. coffee) when generating assets. Defaults to `:js`.
* `orm` defines which orm to use. Defaults to `false` and will use Active Record by default.
* `resource_controller` defines which generator to use for generating a controller when using `rails generate resource`. Defaults to `:controller`.
* `resource_route` defines whether a resource route definition should be generated
diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb
index 77b7e7766f..b835b3f3fd 100644
--- a/railties/lib/rails/generators.rb
+++ b/railties/lib/rails/generators.rb
@@ -56,8 +56,6 @@ module Rails
force_plural: false,
helper: true,
integration_tool: nil,
- javascripts: true,
- javascript_engine: :js,
orm: false,
resource_controller: :controller,
resource_route: true,