diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-12-05 10:26:33 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-12-05 10:26:33 -0800 |
| commit | 2e299fca715b083a60222a85e48f9d3b8dd8ce93 (patch) | |
| tree | 79d4b07c8bde30fb5fe9511c768760d6e3a6937f /railties/lib | |
| parent | b6f0978108f02cadf59a830ed7d83dcada50c223 (diff) | |
| parent | b8b9b766b786facc06ccc5bbc47c0916fe8b62d6 (diff) | |
| download | rails-2e299fca715b083a60222a85e48f9d3b8dd8ce93.tar.gz rails-2e299fca715b083a60222a85e48f9d3b8dd8ce93.tar.bz2 rails-2e299fca715b083a60222a85e48f9d3b8dd8ce93.zip | |
Merge pull request #8429 from reednj77/turbolinks-js-include-order
Revert turbolinks load order requirement
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt | 4 |
1 files changed, 1 insertions, 3 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 6645f40afa..7342bffd9d 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,8 +13,6 @@ <% unless options[:skip_javascript] -%> //= require <%= options[:javascript] %> //= require <%= options[:javascript] %>_ujs -<% end -%> -//= require_tree . -<% unless options[:skip_javascript] -%> //= require turbolinks <% end -%> +//= require_tree . |