Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-15 18:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'email-sender' of https://github.com/uli-heller/gitbucket into uli-heller-email-sender

Browse Source
This commit is contained in:
Naoki Takezoe
2015-07-19 02:13:42 +09:00
parent 775c8cc064 ad55d5199d
commit 29f6e98f9c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/gitbucket/core/util/Notifier.scala
View File

@@ -87,7 +87,7 @@ class Mailer(private val smtp: Smtp) extends Notifier {
email.setSSLOnConnect(ssl) email.setSSLOnConnect(ssl)
} }
smtp.fromAddress smtp.fromAddress
.map (_ -> smtp.fromName.orNull) .map (_ -> smtp.fromName.getOrElse(context.loginAccount.get.userName))
.orElse (Some("notifications@gitbucket.com" -> context.loginAccount.get.userName)) .orElse (Some("notifications@gitbucket.com" -> context.loginAccount.get.userName))
.foreach { case (address, name) => .foreach { case (address, name) =>
email.setFrom(address, name) email.setFrom(address, name)