From b8b9b766b786facc06ccc5bbc47c0916fe8b62d6 Mon Sep 17 00:00:00 2001 From: Nick Reed Date: Wed, 5 Dec 2012 11:51:16 -0600 Subject: Revert turbolinks load order requirement --- .../rails/app/templates/app/assets/javascripts/application.js.tt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'railties/lib/rails') 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 . -- cgit v1.2.3