fixes #1289

2014-03-18 11:21:10 -07:00
parent 97dcfa3d2a
commit de34d21f76
6 changed files with 56 additions and 0 deletions
--- a/app/views/forum_topics/_secondary_links.html.erb
+++ b/app/views/forum_topics/_secondary_links.html.erb
@@ -31,6 +31,7 @@
          <% else %>
            <li><%= link_to "Sticky", forum_topic_path(@forum_topic, :forum_topic => {:is_sticky => true}), :method => :put, :confirm => "Are you sure you want to sticky this forum topic?" %></li>
          <% end %>
+          <li><%= link_to "Merge", new_merge_forum_topic_path(@forum_topic) %></li>
        <% end %>
      <% end %>
    <% end %>