aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-06-03 19:03:21 +0930
committerGitHub <noreply@github.com>2017-06-03 19:03:21 +0930
commitab4f811d091509758d6c527c2bfed92250412e51 (patch)
tree0f3c418731a8014f930560226e3733ff390f6265
parentc10f4fff494cf3b2bb236f4227ecaf1f3f2e0b7c (diff)
parent116b70ca7d45f734b888073e847fec113e9f4a7f (diff)
downloadrails-ab4f811d091509758d6c527c2bfed92250412e51.tar.gz
rails-ab4f811d091509758d6c527c2bfed92250412e51.tar.bz2
rails-ab4f811d091509758d6c527c2bfed92250412e51.zip
Merge pull request #29342 from koic/change_application_js_included_in_rails_app
Change default application.js included in new Rails app [ci skip]
-rw-r--r--guides/source/asset_pipeline.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/guides/source/asset_pipeline.md b/guides/source/asset_pipeline.md
index 22b6b278d7..5d774566dd 100644
--- a/guides/source/asset_pipeline.md
+++ b/guides/source/asset_pipeline.md
@@ -447,15 +447,15 @@ For example, a new Rails application includes a default
```js
// ...
-//= require jquery
-//= require jquery_ujs
+//= require rails-ujs
+//= require turbolinks
//= require_tree .
```
In JavaScript files, Sprockets directives begin with `//=`. In the above case,
the file is using the `require` and the `require_tree` directives. The `require`
directive is used to tell Sprockets the files you wish to require. Here, you are
-requiring the files `jquery.js` and `jquery_ujs.js` that are available somewhere
+requiring the files `rails-ujs.js` and `turbolinks.js` that are available somewhere
in the search path for Sprockets. You need not supply the extensions explicitly.
Sprockets assumes you are requiring a `.js` file when done from within a `.js`
file.