Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f9ec4a19
Commit
f9ec4a19
authored
Apr 16, 2018
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert incoming email patch for GitLab.com
parent
3d2e355d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
21 deletions
+0
-21
lib/gitlab/incoming_email.rb
lib/gitlab/incoming_email.rb
+0
-2
spec/lib/gitlab/incoming_email_spec.rb
spec/lib/gitlab/incoming_email_spec.rb
+0
-19
No files found.
lib/gitlab/incoming_email.rb
View file @
f9ec4a19
...
...
@@ -52,8 +52,6 @@ module Gitlab
private
def
address_regex
return
/^incoming\+(.+)@(incoming\.)?gitlab\.com$/
if
Gitlab
.
com?
wildcard_address
=
config
.
address
return
nil
unless
wildcard_address
...
...
spec/lib/gitlab/incoming_email_spec.rb
View file @
f9ec4a19
...
...
@@ -87,25 +87,6 @@ describe Gitlab::IncomingEmail do
it
'does not match emails with extra bits'
do
expect
(
described_class
.
key_from_address
(
'somereplies+somekey@example.com.someotherdomain.com'
)).
to
be
nil
end
context
"on GitLab.com"
do
before
do
allow
(
Gitlab
).
to
receive
(
:com?
).
and_return
(
true
)
end
it
"returns the reply key when using @gitlab.com"
do
expect
(
described_class
.
key_from_address
(
"incoming+key@gitlab.com"
)).
to
eq
(
"key"
)
end
it
"returns the reply key when using @incoming.gitlab.com"
do
expect
(
described_class
.
key_from_address
(
"incoming+key@incoming.gitlab.com"
)).
to
eq
(
"key"
)
end
it
"does not match other addresses"
do
expect
(
described_class
.
key_from_address
(
"fooincoming+key@incoming.gitlab.com"
)).
to
be_nil
expect
(
described_class
.
key_from_address
(
"incoming+key@incoming.gitlab.com.someotherdomain.com"
)).
to
be_nil
end
end
end
context
'self.key_from_fallback_message_id'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment