diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/mailers/emails/reviews.rb | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/mailers/emails/reviews.rb')
-rw-r--r-- | app/mailers/emails/reviews.rb | 4 |
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 |