Merge branch 'next-minor' into develop

Changelog.md

@@ -28,6 +28,7 @@
 * Remove whitespaces next to like link in stream [#7088](https://github.com/diaspora/diaspora/pull/7088)
 * Prevent overflow of interaction avatars in the single post view [#7070](https://github.com/diaspora/diaspora/pull/7070)
 * Fix moving publisher on first click after page load [#7094](https://github.com/diaspora/diaspora/pull/7094)
+* Fix link to comment on report page [#7105](https://github.com/diaspora/diaspora/pull/7105)
 
 ## Features
 * Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045)

app/helpers/report_helper.rb

@@ -10,7 +10,7 @@ module ReportHelper
     when Comment
       raw t("report.comment_label", data: link_to(
         h(comment_message(item)),
-        post_path(item.post.id, anchor: item.author.guid)
+        post_path(item.post.id, anchor: item.guid)
       ))
     else
       raw t("report.not_found")

spec/helpers/report_helper_spec.rb

@@ -23,7 +23,7 @@ describe ReportHelper, type: :helper do
     end
     it "contains an anchor to the comment" do
       expect(helper.report_content(@comment_report))
-        .to include %(href="#{post_path(@post, anchor: @comment.author.guid)}")
+        .to include %(href="#{post_path(@post, anchor: @comment.guid)}")
     end
   end
 end