Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-30 03:09:09 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-30 03:09:09 +0300
commitc36e59283ebcfd75281a9dda227ed060eeb5fbe7 (patch)
tree282c293bb93f3fc7798485b2410c47fdbf2cd50a /lib/gitlab/incoming_email.rb
parent27d314277bfe7fffec215efa9b1833a23bb82940 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/incoming_email.rb')
-rw-r--r--lib/gitlab/incoming_email.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/incoming_email.rb b/lib/gitlab/incoming_email.rb
index eece4edf895..4547a9b0a01 100644
--- a/lib/gitlab/incoming_email.rb
+++ b/lib/gitlab/incoming_email.rb
@@ -61,7 +61,7 @@ module Gitlab
regex = Regexp.escape(wildcard_address)
regex = regex.sub(Regexp.escape(WILDCARD_PLACEHOLDER), '(.+)')
- Regexp.new(/\A#{regex}\z/).freeze
+ Regexp.new(/\A<?#{regex}>?\z/).freeze
end
end
end