From 7eb586f57f3e9eb63954a432180b4661ffca7916 Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Mon, 4 Nov 2013 15:00:19 -0800
Subject: application template respects Gemfile entries

---
 .../rails/app/templates/app/views/layouts/application.html.erb.tt    | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
index 4cf47bd0a0..fe71f7122c 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
@@ -5,8 +5,13 @@
   <%- if options[:skip_javascript] -%>
   <%%= stylesheet_link_tag    "application", media: "all" %>
   <%- else -%>
+    <%- if gemfile_entries.any? { |m| m.name == "turbolinks" } -%>
   <%%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
   <%%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+    <%- else -%>
+  <%%= stylesheet_link_tag    "application", media: "all" %>
+  <%%= javascript_include_tag "application" %>
+    <%- end -%>
   <%- end -%>
   <%%= csrf_meta_tags %>
 </head>
-- 
cgit v1.2.3