Merge remote-tracking branch 'upstream/pull/2494'

[rails.git] / app / views / traces / show.html.erb

diff --git a/app/views/traces/show.html.erb b/app/views/traces/show.html.erb
index 728b29c45fee0868af0ba14a891be4d5b3904a1c..e049797a864127ea8a0a164613fba02c4e0f7980 100644 (file)
--- a/app/views/traces/show.html.erb
+++ b/app/views/traces/show.html.erb
@@ -40,7 +40,7 @@
     <td><%= t ".tags" %></td>
     <td>
     <% unless @trace.tags.empty? %>
     <td><%= t ".tags" %></td>
     <td>
     <% unless @trace.tags.empty? %>

-      <%= raw(@trace.tags.collect { |tag| link_to tag.tag, :controller => "traces", :action => "index", :tag => tag.tag, :id => nil }.join(", ")) %>
+      <%= safe_join(@trace.tags.collect { |tag| link_to tag.tag, :controller => "traces", :action => "index", :tag => tag.tag, :id => nil }, ", ") %>

     <% else %>
       <i><%= t ".none" %></i>
     <% end %>
     <% else %>
       <i><%= t ".none" %></i>
     <% end %>