From d2ab7a68e4c3f1e619af3576e1443afa2f98cdfd Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Mar 2014 14:32:08 -0500
Subject: [PATCH] Fixed bug in merge: improper use of force and failing on FORCED result
---
src/main/java/com/gitblit/manager/INotificationManager.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/INotificationManager.java b/src/main/java/com/gitblit/manager/INotificationManager.java
index 29d8f54..6bee2f8 100644
--- a/src/main/java/com/gitblit/manager/INotificationManager.java
+++ b/src/main/java/com/gitblit/manager/INotificationManager.java
@@ -17,6 +17,8 @@
import java.util.Collection;
+import com.gitblit.models.Mailing;
+
public interface INotificationManager extends IManager {
/**
@@ -43,24 +45,14 @@
* @param message
* @param toAddresses
*/
- void sendMail(String subject, String message, String... toAddresses);
-
- /**
- * Notify users by email of something.
- *
- * @param subject
- * @param message
- * @param toAddresses
- */
void sendHtmlMail(String subject, String message, Collection<String> toAddresses);
/**
* Notify users by email of something.
*
- * @param subject
- * @param message
- * @param toAddresses
+ * @param mailing
+ * @return the mail message object
*/
- void sendHtmlMail(String subject, String message, String... toAddresses);
+ void send(Mailing mailing);
}
\ No newline at end of file
--
Gitblit v1.9.1