Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
MKCLOS
Core Development Platform
corepkgv2
Commits
411fd2ab
Commit
411fd2ab
authored
5 years ago
by
Akshay Bharambe
Browse files
Options
Downloads
Patches
Plain Diff
testing fixes
parent
3b721767
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!113
31 Aug MEP Merge Dev to Stg
,
!108
Email: Reply-To feature added
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
notificationmdl/email/email.go
+1
-1
notificationmdl/email/email.go
notificationmdl/email/emailSLS.go
+1
-0
notificationmdl/email/emailSLS.go
with
2 additions
and
1 deletion
notificationmdl/email/email.go
+
1
−
1
View file @
411fd2ab
...
...
@@ -150,11 +150,11 @@ func (email *Email) Send() error {
message
:=
gomail
.
NewMessage
()
message
.
SetHeader
(
"From"
,
email
.
from
)
message
.
SetHeader
(
"To"
,
email
.
to
...
)
message
.
SetHeader
(
"Reply-To"
,
email
.
replyTo
)
message
.
SetHeader
(
"Cc"
,
email
.
cc
...
)
message
.
SetHeader
(
"Bcc"
,
email
.
bcc
...
)
message
.
SetHeader
(
"Subject"
,
email
.
subject
)
message
.
SetHeader
(
"Message-ID"
,
getMSGIDHeader
(
domain
,
guidmdl
.
GetGUID
()))
message
.
SetAddressHeader
(
"Reply-To"
,
email
.
replyTo
,
""
)
if
len
(
strings
.
TrimSpace
(
email
.
plainBody
))
==
0
{
message
.
SetBody
(
"text/html"
,
email
.
body
)
}
else
{
...
...
This diff is collapsed.
Click to expand it.
notificationmdl/email/emailSLS.go
+
1
−
0
View file @
411fd2ab
...
...
@@ -58,6 +58,7 @@ func (email *Email) SendMailFromSLS(hostName string) error {
message
:=
gomail
.
NewMessage
()
message
.
SetHeader
(
"From"
,
email
.
from
)
message
.
SetHeader
(
"To"
,
email
.
to
...
)
message
.
SetHeader
(
"Reply-To"
,
email
.
replyTo
)
message
.
SetHeader
(
"Cc"
,
email
.
cc
...
)
message
.
SetHeader
(
"Bcc"
,
email
.
bcc
...
)
message
.
SetHeader
(
"Subject"
,
email
.
subject
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets