diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-11-04 15:00:19 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-11-04 15:00:29 -0800 |
| commit | 7eb586f57f3e9eb63954a432180b4661ffca7916 (patch) | |
| tree | 1a2fb0817e64d7dac409a56a026fe86e454b48db /railties/lib/rails | |
| parent | 8beb42cfbc41753ae4dbb91e16abcd1fb7d00356 (diff) | |
| download | rails-7eb586f57f3e9eb63954a432180b4661ffca7916.tar.gz rails-7eb586f57f3e9eb63954a432180b4661ffca7916.tar.bz2 rails-7eb586f57f3e9eb63954a432180b4661ffca7916.zip | |
application template respects Gemfile entries
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt | 5 |
1 files changed, 5 insertions, 0 deletions
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> |