diff options
| author | James Moger <james.moger@gitblit.com> | 2014-06-16 17:36:12 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-06-16 17:36:12 -0400 |
| commit | 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c (patch) | |
| tree | 4bdb208cede00e637ce4704d942aa045f5af5ed9 /src/main/java/com/gitblit/tickets/TicketNotifier.java | |
| parent | 07eb0963cae3a403f8774f65afa20c940ce7124f (diff) | |
| parent | 9b575e8fac8d5e17e77cc284092abd856ddec8ac (diff) | |
| download | gitblit-6b18b0761b726fd9aef1ebcc21b760378f7d4b5c.tar.gz gitblit-6b18b0761b726fd9aef1ebcc21b760378f7d4b5c.zip | |
Merge release 1.6.0
Diffstat (limited to 'src/main/java/com/gitblit/tickets/TicketNotifier.java')
| -rw-r--r-- | src/main/java/com/gitblit/tickets/TicketNotifier.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/tickets/TicketNotifier.java b/src/main/java/com/gitblit/tickets/TicketNotifier.java index 9a5e4e1d..07371b1b 100644 --- a/src/main/java/com/gitblit/tickets/TicketNotifier.java +++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java @@ -545,7 +545,6 @@ public class TicketNotifier { } } } - mailing.setRecipients(toAddresses); // // CC recipients @@ -554,7 +553,7 @@ public class TicketNotifier { // repository owners if (!ArrayUtils.isEmpty(repository.owners)) { - tos.addAll(repository.owners); + ccs.addAll(repository.owners); } // cc users mentioned in last comment @@ -595,6 +594,14 @@ public class TicketNotifier { } ccAddresses.addAll(settings.getStrings(Keys.mail.mailingLists)); + // respect the author's email preference + UserModel lastAuthor = userManager.getUserModel(lastChange.author); + if (!lastAuthor.getPreferences().isEmailMeOnMyTicketChanges()) { + toAddresses.remove(lastAuthor.emailAddress); + ccAddresses.remove(lastAuthor.emailAddress); + } + + mailing.setRecipients(toAddresses); mailing.setCCs(ccAddresses); } |