diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-19 15:09:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-19 15:09:03 +0300 |
| commit | bf420c684d41038b22c72bbdea8a5d42aec70f58 (patch) | |
| tree | 9c0988727903f77d957dfbfc354b5191be739852 /app/mailers | |
| parent | 472a7da0e565894f7128becb5b1cf67572a13491 (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 8f947ea7113..912dbab5ee4 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -70,7 +70,7 @@ class Notify < ApplicationMailer return unless sender = User.find(sender_id) address = default_sender_address - address.display_name = sender_name.presence || sender.name + address.display_name = sender_name.presence || "#{sender.name} (#{sender.to_reference})" if send_from_user_email && can_send_from_user_email?(sender) address.address = sender.email |