diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-03 18:38:07 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-03 18:38:07 -0800 |
| commit | 5004363a142240adfb7194807b3e14dca9ec9487 (patch) | |
| tree | 743588a19b99e8d68682e97a05351da80b8f254b /railties | |
| parent | e1ce84b1a95cfc6aac0ae904e6597f467f229eac (diff) | |
| parent | 13ba4fe6f6bde4f6807c0d42d930ea9c0dbd86e0 (diff) | |
| download | rails-5004363a142240adfb7194807b3e14dca9ec9487.tar.gz rails-5004363a142240adfb7194807b3e14dca9ec9487.tar.bz2 rails-5004363a142240adfb7194807b3e14dca9ec9487.zip | |
Merge pull request #8411 from YasuOza/turbolinks_require_bottom
Locate `=require turbolinks` at the bottom of application.js
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt | 4 |
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 -%> |