Merge pull request #8429 from reednj77/turbolinks-js-include-order

Revert turbolinks load order requirement

Merge pull request #8429 from reednj77/turbolinks-js-include-order
Revert turbolinks load order requirement
2e299fca · Carlos Antonio da Silva · b6f09781 · b8b9b766 · 2e299fca
隐藏空白更改
内联并排

Showing with 1 addition and 3 deletion

railties/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt ...ls/app/templates/app/assets/javascripts/application.js.tt +1 -3

未找到文件。
--- 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 .