Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Revert turbolinks load order requirement #8429

Merged
merged 1 commit into from

2 participants

@reed

As of Turbolinks 0.6.1, the turbolinks script doesn't need to be last in the manifest.

Reverts the change made in #8411.

@carlosantoniodasilva carlosantoniodasilva merged commit 2e299fc into from
@carlosantoniodasilva

Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 5, 2012
  1. @reed
This page is out of date. Refresh to see the latest.
View
4 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 .
Something went wrong with that request. Please try again.