summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-05-01 16:11:11 +0000
committerDouwe Maan <douwe@gitlab.com>2017-05-01 16:11:11 +0000
commit45f3b0b779b828c8afe4fcb1d0749266416f6b9e (patch)
tree47e83296a4d07ea404b8030409045ee69712c05c /lib
parent2b7e31825df4409742c545d15884ef18067aad5e (diff)
parent08b1380ff712f46a6005d366a9159a3e81674fb7 (diff)
downloadgitlab-ce-45f3b0b779b828c8afe4fcb1d0749266416f6b9e.tar.gz
Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master'
Don't blow up when email has no References header Closes gitlab-ee#2247 See merge request !11014
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/email/receiver.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/email/receiver.rb b/lib/gitlab/email/receiver.rb
index 419d56a51e0..c270c0ea9ff 100644
--- a/lib/gitlab/email/receiver.rb
+++ b/lib/gitlab/email/receiver.rb
@@ -70,6 +70,8 @@ module Gitlab
# Handle emails from clients which append with commas,
# example clients are Microsoft exchange and iOS app
Gitlab::IncomingEmail.scan_fallback_references(references)
+ when nil
+ []
end
end