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

app/views/api/changesets/_changeset.json.jbuilder

@@ -21,9 +21,10 @@ end
 
 json.tags changeset.tags unless changeset.tags.empty?
 
-if @include_discussion
-  json.comments(changeset.comments) do |comment|
+if @comments
+  json.comments(@comments) do |comment|
     json.id comment.id
+    json.visible comment.visible
     json.date comment.created_at.xmlschema
     if comment.author.data_public?
       json.uid comment.author.id

app/views/api/changesets/_changeset.xml.builder

@@ -24,12 +24,13 @@ xml.changeset(attrs) do |changeset_xml_node|
 
   # include discussion if requested
 
-  if @include_discussion
+  if @comments
     changeset_xml_node.discussion do |discussion_xml_node|
-      changeset.comments.includes(:author).each do |comment|
+      @comments.each do |comment|
         cattrs = {
           "id" => comment.id,
-          "date" => comment.created_at.xmlschema
+          "date" => comment.created_at.xmlschema,
+          "visible" => comment.visible
         }
         if comment.author.data_public?
           cattrs["uid"] = comment.author.id