diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2019-03-19 20:57:38 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 20:57:38 -0400 | 
| commit | b504a5d96e0ec30856a3fc54305550f3586002aa (patch) | |
| tree | 73b063e8a98cef8e122261b0542c300d880d652f /railties/lib/rails | |
| parent | a207b9422762429ea365c519beaacf965df24cb9 (diff) | |
| parent | 49f4625b70ea4d4831ad3f32930642548d62fe5e (diff) | |
| download | rails-b504a5d96e0ec30856a3fc54305550f3586002aa.tar.gz rails-b504a5d96e0ec30856a3fc54305550f3586002aa.tar.bz2 rails-b504a5d96e0ec30856a3fc54305550f3586002aa.zip  | |
Merge pull request #35675 from larouxn/revert-35656-revert-34277-remove-javascripts-javascripts_engine-options-for-generators
Revert "Revert "Remove `javascripts` and `javascript_engine` options for generators""
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators.rb | 2 | 
1 files changed, 0 insertions, 2 deletions
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,  | 
