diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-16 06:09:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-16 06:09:00 +0300 |
| commit | a0dd45d8c8eca7b98e5ec37a411ac71c0a09b335 (patch) | |
| tree | ff3eab14e88a2e7ee747d94f1daaef1d4304320d /app/mailers | |
| parent | 72179bac11e9c18ea623e30594d6d427ef63db36 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/notify.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 912dbab5ee4..5f5afef350b 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -178,7 +178,7 @@ class Notify < ApplicationMailer headers['In-Reply-To'] = message_id(note.references.last) headers['References'] = note.references.map { |ref| message_id(ref) } - headers['X-GitLab-Discussion-ID'] = note.discussion.id if note.part_of_discussion? + headers['X-GitLab-Discussion-ID'] = note.discussion.id if note.part_of_discussion? || note.can_be_discussion_note? headers[:subject] = "Re: #{headers[:subject]}" if headers[:subject] |