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

diff --combined app/views/browse/changeset.html.erb
index d04d5e6bd711d8547f64c6ac82a01f7325835802,cbc457d30003b051b45614f769fc8a0536ef071f..079915fcf1f48187023d729c690b3ac83102648b
--- 1/app/views/browse/changeset.html.erb
--- 2/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@@ -51,7 -51,7 +51,7 @@@
                          :when => friendly_date_ago(comment.created_at),
                          :exact_time => l(comment.created_at),
                          :user => link_to(comment.author.display_name, user_path(comment.author))) %>
 -                  — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t("javascripts.changesets.show.unhide_comment") %></span>
 +                  — <span class="action-button text-muted" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t("javascripts.changesets.show.unhide_comment") %></span>
                   </small>
                  <%= comment.body.to_html %>
                </li>
@@@ -64,7 -64,7 +64,7 @@@
  
    <% unless current_user %>
      <div class="notice">
-       <%= link_to(t(".join_discussion"), :controller => "users", :action => "login", :referer => request.fullpath) %>
+       <%= link_to(t(".join_discussion"), login_path(:referer => request.fullpath)) %>
      </div>
    <% end %>