aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-16 17:01:39 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-16 17:01:39 -0200
commit97e413002639c1e19503f9c9875fc83428c36f51 (patch)
tree8d224d529b91fe3a936b837b68ee5b88b7b50e85 /railties
parent5f02b156aaa82eea2aef1db9a9daf0321c800e6c (diff)
downloadrails-97e413002639c1e19503f9c9875fc83428c36f51.tar.gz
rails-97e413002639c1e19503f9c9875fc83428c36f51.tar.bz2
rails-97e413002639c1e19503f9c9875fc83428c36f51.zip
Only include action cable meta tags if it is not skipped
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt2
1 files changed, 2 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 30274e0cff..68b5c051b2 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
@@ -3,7 +3,9 @@
<head>
<title><%= camelized %></title>
<%%= csrf_meta_tags %>
+ <%- unless options[:skip_action_cable] -%>
<%%= action_cable_meta_tag %>
+ <%- end -%>
<%- if options[:skip_javascript] -%>
<%%= stylesheet_link_tag 'application', media: 'all' %>