diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-03 00:18:25 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-03 00:18:25 +0000 |
| commit | 33bbd0b39bda02f24468184e5e3d8f6d257246d4 (patch) | |
| tree | d6dc66e9ec9fec41a2e957fbbf1340daaea54497 /lib/gitlab/email | |
| parent | a1ee5ac49b801535223f7498762f0c0820165a1a (diff) | |
| download | gitlab-ce-33bbd0b39bda02f24468184e5e3d8f6d257246d4.tar.gz | |
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 71b1d4ed8f9..57d47ce9ccc 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.reply_to || []).first || mail.from.first || mail.sender + mail.from.first || mail.sender end def can_handle_legacy_format? |