diff options
author | Javan Makhmali <javan@javan.us> | 2018-02-12 10:34:29 -0500 |
---|---|---|
committer | Javan Makhmali <javan@javan.us> | 2018-02-12 10:34:29 -0500 |
commit | 2f13b3c9fe21debec4bd9afe4601125f4fe29ce2 (patch) | |
tree | 973bfc4599de65fddfe39206374b7424f4e7e7ec /test/dummy/app/views | |
parent | 63add5acc4a9bd84907bf6bf17de307792336539 (diff) | |
download | rails-2f13b3c9fe21debec4bd9afe4601125f4fe29ce2.tar.gz rails-2f13b3c9fe21debec4bd9afe4601125f4fe29ce2.tar.bz2 rails-2f13b3c9fe21debec4bd9afe4601125f4fe29ce2.zip |
Pull activetext.js into dummy app with webpacker
Diffstat (limited to 'test/dummy/app/views')
-rw-r--r-- | test/dummy/app/views/layouts/application.html.erb | 4 | ||||
-rw-r--r-- | test/dummy/app/views/messages/show.html.erb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/dummy/app/views/layouts/application.html.erb b/test/dummy/app/views/layouts/application.html.erb index a6eb0174b7..f221f512b7 100644 --- a/test/dummy/app/views/layouts/application.html.erb +++ b/test/dummy/app/views/layouts/application.html.erb @@ -4,8 +4,8 @@ <title>Dummy</title> <%= csrf_meta_tags %> - <%= stylesheet_link_tag 'application', media: 'all' %> - <%= javascript_include_tag 'application' %> + <%= stylesheet_link_tag 'application', media: 'all' %> + <%= javascript_pack_tag 'application' %> </head> <body> diff --git a/test/dummy/app/views/messages/show.html.erb b/test/dummy/app/views/messages/show.html.erb index 837b11ef1d..feec71cb93 100644 --- a/test/dummy/app/views/messages/show.html.erb +++ b/test/dummy/app/views/messages/show.html.erb @@ -7,7 +7,7 @@ <p> <strong>Content:</strong> - <%= @message.content %> + <%= raw @message.content %> </p> <%= link_to 'Edit', edit_message_path(@message) %> | |