summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-04-05 09:09:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-04-05 09:09:24 +0000
commitb5e513dbefdc7d27ddfd800c81b80e55f086f3f5 (patch)
tree518dd196e4385f803e670d134a73dd8deeb9b75e /app/mailers
parentb6d0149b925c57cbfff0f2bade605259152e4eea (diff)
downloadgitlab-ce-b5e513dbefdc7d27ddfd800c81b80e55f086f3f5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/reviews.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/mailers/emails/reviews.rb b/app/mailers/emails/reviews.rb
index ddb9e161a80..b98fa8aa6c9 100644
--- a/app/mailers/emails/reviews.rb
+++ b/app/mailers/emails/reviews.rb
@@ -22,6 +22,10 @@ module Emails
review = Review.find_by_id(review_id)
@notes = review.notes
+ @discussions = Discussion.build_discussions(review.discussion_ids, preload_note_diff_file: true)
+ @include_diff_discussion_stylesheet = @discussions.values.any? do |discussion|
+ discussion.diff_discussion? && discussion.on_text?
+ end
@author = review.author
@author_name = review.author_name
@project = review.project