Permalink
Browse files

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

Revert turbolinks load order requirement
  • Loading branch information...
2 parents b6f0978 + b8b9b76 commit 2e299fca715b083a60222a85e48f9d3b8dd8ce93 @carlosantoniodasilva carlosantoniodasilva committed Dec 5, 2012
@@ -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 .

0 comments on commit 2e299fc

Please sign in to comment.