diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-08-29 21:34:02 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-08-29 21:34:02 +0000 |
| commit | 53661b1035c04b3bfe03751d4f82b060734a4fd6 (patch) | |
| tree | f6f1f3ba71f49f7366b655fbdd21ab4db39e5161 /app/mailers | |
| parent | fac22c13a8eac189fd531f6ae7016f6adaf64bcf (diff) | |
| parent | fb93142488cfb79bac45f184b7945018550bf326 (diff) | |
| download | gitlab-ce-53661b1035c04b3bfe03751d4f82b060734a4fd6.tar.gz | |
Merge branch 'security-hide_merge_request_ids_on_emails' into 'master'
Prevent disclosure of merge request id via email
See merge request gitlab/gitlabhq!3313
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/issues.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb index f3a3203f7ad..0bba2a8bf24 100644 --- a/app/mailers/emails/issues.rb +++ b/app/mailers/emails/issues.rb @@ -34,6 +34,8 @@ module Emails setup_issue_mail(issue_id, recipient_id, closed_via: closed_via) @updated_by = User.find(updated_by_user_id) + @recipient = User.find(recipient_id) + mail_answer_thread(@issue, issue_thread_options(updated_by_user_id, recipient_id, reason)) end |