From 06eb51f13d9dcd4e4e5d9d7bb0db4cf18a67b23e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 05 Mar 2014 11:42:34 -0500
Subject: [PATCH] Allow integration (mergeTo) branch to be changed in edit ticket
---
src/main/java/com/gitblit/FederationClient.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/FederationClient.java b/src/main/java/com/gitblit/FederationClient.java
index c275746..628a05d 100644
--- a/src/main/java/com/gitblit/FederationClient.java
+++ b/src/main/java/com/gitblit/FederationClient.java
@@ -32,6 +32,7 @@
import com.gitblit.manager.RuntimeManager;
import com.gitblit.manager.UserManager;
import com.gitblit.models.FederationModel;
+import com.gitblit.models.Mailing;
import com.gitblit.service.FederationPullService;
import com.gitblit.utils.FederationUtils;
import com.gitblit.utils.StringUtils;
@@ -178,15 +179,11 @@
}
@Override
- public void sendMail(String subject, String message, String... toAddresses) {
- }
-
- @Override
public void sendHtmlMail(String subject, String message, Collection<String> toAddresses) {
}
@Override
- public void sendHtmlMail(String subject, String message, String... toAddresses) {
+ public void send(Mailing mailing) {
}
}
}
--
Gitblit v1.9.1