diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-04 00:15:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-04 00:15:26 +0300 |
| commit | b4310f4b45f1fc6128ec69d674b48d727923a3a0 (patch) | |
| tree | c999db428f4b692ee2acb5cd8edb525e2c808502 /lib/gitlab/email | |
| parent | 0aa20f3dac8e19cc10b62e08a5c84df105a648c2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/email')
| -rw-r--r-- | lib/gitlab/email/handler/service_desk_handler.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/email/handler/service_desk_handler.rb b/lib/gitlab/email/handler/service_desk_handler.rb index 57d47ce9ccc..71b1d4ed8f9 100644 --- a/lib/gitlab/email/handler/service_desk_handler.rb +++ b/lib/gitlab/email/handler/service_desk_handler.rb @@ -177,7 +177,7 @@ module Gitlab end def from_address - mail.from.first || mail.sender + (mail.reply_to || []).first || mail.from.first || mail.sender end def can_handle_legacy_format? |