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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
2e92600b
Commit
2e92600b
authored
Oct 01, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Message-ID field to be RFC 2111-compliant to prevent e-mails from being dropped
Closes #2867
parent
2714d5b8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
1 deletion
+3
-1
CHANGELOG
CHANGELOG
+1
-0
app/mailers/notify.rb
app/mailers/notify.rb
+1
-1
spec/mailers/notify_spec.rb
spec/mailers/notify_spec.rb
+1
-0
No files found.
CHANGELOG
View file @
2e92600b
Please view this file on the master branch, on stable branches it's out of date.
Please view this file on the master branch, on stable branches it's out of date.
v 8.1.0 (unreleased)
v 8.1.0 (unreleased)
- Fix Message-ID header to be RFC 2111-compliant to prevent e-mails being dropped (Stan Hu)
- Add user preference to view activities as default dashboard (Stan Hu)
- Add user preference to view activities as default dashboard (Stan Hu)
- Add option to admin area to sign in as a specific user (Pavel Forkert)
- Add option to admin area to sign in as a specific user (Pavel Forkert)
- Show CI status on all pages where commits list is rendered
- Show CI status on all pages where commits list is rendered
...
...
app/mailers/notify.rb
View file @
2e92600b
...
@@ -140,7 +140,7 @@ class Notify < BaseMailer
...
@@ -140,7 +140,7 @@ class Notify < BaseMailer
# * have a 'In-Reply-To' or 'References' header that references the original 'Message-ID'
# * have a 'In-Reply-To' or 'References' header that references the original 'Message-ID'
#
#
def
mail_answer_thread
(
model
,
headers
=
{})
def
mail_answer_thread
(
model
,
headers
=
{})
headers
[
'Message-ID'
]
=
SecureRandom
.
hex
headers
[
'Message-ID'
]
=
"<
#{
SecureRandom
.
hex
}
@
#{
Gitlab
.
config
.
gitlab
.
host
}
>"
headers
[
'In-Reply-To'
]
=
message_id
(
model
)
headers
[
'In-Reply-To'
]
=
message_id
(
model
)
headers
[
'References'
]
=
message_id
(
model
)
headers
[
'References'
]
=
message_id
(
model
)
...
...
spec/mailers/notify_spec.rb
View file @
2e92600b
...
@@ -52,6 +52,7 @@ describe Notify do
...
@@ -52,6 +52,7 @@ describe Notify do
end
end
it
'has headers that reference an existing thread'
do
it
'has headers that reference an existing thread'
do
is_expected
.
to
have_header
'Message-ID'
,
/<(.*)@
#{
Gitlab
.
config
.
gitlab
.
host
}
>/
is_expected
.
to
have_header
'References'
,
/<
#{
thread_id_prefix
}
(.*)@
#{
Gitlab
.
config
.
gitlab
.
host
}
>/
is_expected
.
to
have_header
'References'
,
/<
#{
thread_id_prefix
}
(.*)@
#{
Gitlab
.
config
.
gitlab
.
host
}
>/
is_expected
.
to
have_header
'In-Reply-To'
,
/<
#{
thread_id_prefix
}
(.*)@
#{
Gitlab
.
config
.
gitlab
.
host
}
>/
is_expected
.
to
have_header
'In-Reply-To'
,
/<
#{
thread_id_prefix
}
(.*)@
#{
Gitlab
.
config
.
gitlab
.
host
}
>/
is_expected
.
to
have_header
'X-GitLab-Project'
,
/
#{
project
.
name
}
/
is_expected
.
to
have_header
'X-GitLab-Project'
,
/
#{
project
.
name
}
/
...
...
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