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

diff --cc app/assets/stylesheets/common.scss
Simple merge

diff --cc app/views/browse/changeset.html.erb
Simple merge

diff --cc test/controllers/browse_controller_test.rb
index 1023d76ae58713b521e6d1353c3dee11d630b213,0709d544e8e938739bc00d4a19632d2b8d938ad0..2bb743636ce9d5f5845d0922ddf8a65c5eecf06a
--- 1/test/controllers/browse_controller_test.rb
--- 2/test/controllers/browse_controller_test.rb
+++ b/test/controllers/browse_controller_test.rb
@@@ -142,29 -142,6 +142,15 @@@ class BrowseControllerTest < ActionDisp
      browse_check :changeset_path, changeset.id, "browse/changeset"
    end
  
-   def test_read_changeset_hidden_comments
-     changeset = create(:changeset)
-     create_list(:changeset_comment, 3, :changeset => changeset)
-     create(:changeset_comment, :visible => false, :changeset => changeset)
- 
-     browse_check :changeset_path, changeset.id, "browse/changeset"
-     assert_select "div.changeset-comments ul li", :count => 3
- 
-     session_for(create(:moderator_user))
- 
-     browse_check :changeset_path, changeset.id, "browse/changeset"
-     assert_select "div.changeset-comments ul li", :count => 4
-   end
- 
 +  def test_read_changeset_element_links
 +    changeset = create(:changeset)
 +    node = create(:node, :with_history, :changeset => changeset)
 +
 +    browse_check :changeset_path, changeset.id, "browse/changeset"
 +    assert_dom "a[href='#{node_path node}']", :count => 1
 +    assert_dom "a[href='#{old_node_path node, 1}']", :count => 1
 +  end
 +
    ##
    #  Methods to check redaction.
    #