artin/sourcegraph
1
0
Fork 0
mirror of https://github.com/sourcegraph/sourcegraph.git synced 2026-02-06 19:51:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

email: Use configuration email address in render func (#38589)

Browse Source 
* email: Use configuration email address in render func.

* Update CHANGELOG.md

Co-authored-by: Joe Chen <jc@unknwon.io>
This commit is contained in:
Alan Scherger 2022-07-12 09:22:05 -05:00 committed by GitHub
parent 0a45bcd945
commit 4ff19efc0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -41,6 +41,7 @@ All notable changes to Sourcegraph are documented in this file.
- The file view does not jump to the first selected line anymore when selecting multiple lines and the first selected line was out of view. [#38175](https://github.com/sourcegraph/sourcegraph/pull/38175)
- Fixed an issue where multiple activations of the back button are required to navigate back to a previously selected line in a file [#38193](https://github.com/sourcegraph/sourcegraph/pull/38193)
- Support timestamps with numeric timezone format from Gitlab's Webhook payload [#38250](https://github.com/sourcegraph/sourcegraph/pull/38250)
- Fixed regression of mismatched `From` address when render emails. [#38589](https://github.com/sourcegraph/sourcegraph/pull/38589)
### Removed

2
internal/txemail/txemail.go
View File

@ -40,7 +40,7 @@ var emailSendCounter = promauto.NewCounterVec(prometheus.CounterOpts{
func render(message Message) (*email.Email, error) {
m := email.Email{
To: message.To,
From: "Sourcegraph",
From: conf.Get().EmailAddress,
Headers: make(textproto.MIMEHeader),
}
if message.ReplyTo != nil {