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

Revert turbolinks load order requirement
This commit is contained in:
Carlos Antonio da Silva 2012-12-05 10:26:33 -08:00
commit 2e299fca71
1 changed files with 1 additions and 3 deletions

View File

@ -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 .