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
90bed306
Commit
90bed306
authored
Apr 30, 2021
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename message_id to mail_uid
This avoids potentially conflicting types with integers and strings.
parent
cebf2398
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/email/receiver.rb
lib/gitlab/email/receiver.rb
+1
-1
spec/lib/gitlab/email/receiver_spec.rb
spec/lib/gitlab/email/receiver_spec.rb
+1
-1
No files found.
lib/gitlab/email/receiver.rb
View file @
90bed306
...
...
@@ -26,7 +26,7 @@ module Gitlab
def
mail_metadata
{
m
essage_
id:
mail
.
message_id
,
m
ail_u
id:
mail
.
message_id
,
from_address:
mail
.
from
,
to_address:
mail
.
to
,
mail_key:
mail_key
,
...
...
spec/lib/gitlab/email/receiver_spec.rb
View file @
90bed306
...
...
@@ -24,7 +24,7 @@ RSpec.describe Gitlab::Email::Receiver do
stub_incoming_email_setting
(
enabled:
true
,
address:
"incoming+%{key}@appmail.example.com"
)
expect
(
receiver
.
mail_metadata
.
keys
).
to
match_array
(
%i(m
essage_
id from_address to_address mail_key references delivered_to envelope_to x_envelope_to)
)
expect
(
receiver
.
mail_metadata
.
keys
).
to
match_array
(
%i(m
ail_u
id from_address to_address mail_key references delivered_to envelope_to x_envelope_to)
)
end
context
'when in a Delivered-To header'
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