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

app/controllers/traces_controller.rb

@@ -65,19 +65,9 @@ class TracesController < ApplicationController
     @traces = @traces.limit(@page_size)
     @traces = @traces.includes(:user, :tags)
 
-    # put together SET of tags across traces, for related links
-    tagset = {}
-    @traces.each do |trace|
-      trace.tags.reload if params[:tag] # if searched by tag, ActiveRecord won't bring back other tags, so do explicitly here
-      trace.tags.each do |tag|
-        tagset[tag.tag] = tag.tag
-      end
-    end
-
     # final helper vars for view
     @target_user = target_user
     @display_name = target_user.display_name if target_user
-    @all_tags = tagset.values
   end
 
   def mine

app/views/traces/_trace_optionals.html.erb

@@ -1,10 +0,0 @@
-<% content_for :optionals do %>
-  <div class="optionalbox">
-    <h4><%= t ".tags" %></h4>
-    <% if @all_tags %>
-      <% @all_tags.each do |tag| %>
-        <%= link_to_tag tag %><br />
-      <% end %>
-    <% end %>
-  </div>
-<% end %>

app/views/traces/index.html.erb

@@ -41,5 +41,3 @@
 <% else %>
   <h4><%= t ".empty_html", :upload_link => new_trace_path %></h4>
 <% end %>
-
-<%= render :partial => "trace_optionals" %>