from_address in ServiceDesk prefers 'from' over 'sender'

228aa837 · Andreas Josephson · Sean McGivern · 9c662234 · 228aa837
Commit 228aa837 authored Oct 12, 2017 by Andreas Josephson Committed by Sean McGivern Aug 28, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ee/lib/gitlab/email/handler/ee/service_desk_handler.rb ee/lib/gitlab/email/handler/ee/service_desk_handler.rb +1 -1

No files found.
--- a/ee/lib/gitlab/email/handler/ee/service_desk_handler.rb
+++ b/ee/lib/gitlab/email/handler/ee/service_desk_handler.rb
@@ -59,7 +59,7 @@ module Gitlab
          end

          def from_address
-            (mail.reply_to || []).first || mail.sender || mail.from.first
+            (mail.reply_to || []).first || mail.from.first || mail.sender
          end

          def issue_title