diff options
| author | Thomas Boerger <thomas@webhippie.de> | 2016-11-03 09:07:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-03 09:07:55 +0100 |
| commit | 980282a06fd33cd2d9744fe86e19e9207c47b06b (patch) | |
| tree | c10f9607943d67259867c226738803b31486761a /models | |
| parent | 060d10a4cb6ce5247af1b2f8dec6bf99718d8ec2 (diff) | |
| parent | d8de2beb5b92d02a0597ba7c7803839380666653 (diff) | |
| download | gitea-980282a06fd33cd2d9744fe86e19e9207c47b06b.tar.gz gitea-980282a06fd33cd2d9744fe86e19e9207c47b06b.zip | |
Merge branch 'develop' into develop
Diffstat (limited to 'models')
| -rw-r--r-- | models/mail.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/mail.go b/models/mail.go index 0db21355a8..85f1560b44 100644 --- a/models/mail.go +++ b/models/mail.go @@ -160,7 +160,7 @@ func composeIssueMessage(issue *Issue, doer *User, tplName base.TplName, tos []s if err != nil { log.Error(3, "HTMLString (%s): %v", tplName, err) } - msg := mailer.NewMessageFrom(tos, fmt.Sprintf(`"%s" <%s>`, doer.DisplayName(), setting.MailService.User), subject, content) + msg := mailer.NewMessageFrom(tos, fmt.Sprintf(`"%s" <%s>`, doer.DisplayName(), setting.MailService.FromEmail), subject, content) msg.Info = fmt.Sprintf("Subject: %s, %s", subject, info) return msg } |