aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2015-05-17 16:30:46 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2015-05-17 16:30:46 -0300
commit1622298428d8216303535c802aca299cf235767f (patch)
treea333361924b3d4dac3d2230021af60c638740966 /guides
parentd0abd56b1a8fcf23d4ee51253f33255d615e892c (diff)
parent697336871934d2d3898b2617e0ba77bb214e05da (diff)
downloadrails-1622298428d8216303535c802aca299cf235767f.tar.gz
rails-1622298428d8216303535c802aca299cf235767f.tar.bz2
rails-1622298428d8216303535c802aca299cf235767f.zip
Merge pull request #20178 from vngrs/fix_wrong_default_value_of_javascript_engine
config.generators javascript_engine default value is :js not nil
Diffstat (limited to 'guides')
-rw-r--r--guides/source/configuring.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md
index 01702f4ecb..9e2588ecb3 100644
--- a/guides/source/configuring.md
+++ b/guides/source/configuring.md
@@ -187,7 +187,7 @@ 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. Defaults to `nil`.
* `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 `nil`.
+* `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 inject resource route definition in routes or not. Defaults to `true`.