aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYasuharu Ozaki <yasuharu.ozaki@gmail.com>2012-12-04 11:18:44 +0900
committerYasuharu Ozaki <yasuharu.ozaki@gmail.com>2012-12-04 11:18:44 +0900
commit13ba4fe6f6bde4f6807c0d42d930ea9c0dbd86e0 (patch)
tree743588a19b99e8d68682e97a05351da80b8f254b
parente1ce84b1a95cfc6aac0ae904e6597f467f229eac (diff)
downloadrails-13ba4fe6f6bde4f6807c0d42d930ea9c0dbd86e0.tar.gz
rails-13ba4fe6f6bde4f6807c0d42d930ea9c0dbd86e0.tar.bz2
rails-13ba4fe6f6bde4f6807c0d42d930ea9c0dbd86e0.zip
Locate `=require turbolinks` at the bottom of application.js
Turbolinks should be located at the bottom of application.js to detect assets change properly.
-rw-r--r--railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt4
1 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
index 7342bffd9d..6645f40afa 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
+++ b/railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
@@ -13,6 +13,8 @@
<% unless options[:skip_javascript] -%>
//= require <%= options[:javascript] %>
//= require <%= options[:javascript] %>_ujs
-//= require turbolinks
<% end -%>
//= require_tree .
+<% unless options[:skip_javascript] -%>
+//= require turbolinks
+<% end -%>