Merge release 1.6.0

1 files changed, 11 insertions, 0 deletions

diff --git a/src/main/java/com/gitblit/tickets/NullTicketService.java b/src/main/java/com/gitblit/tickets/NullTicketService.java
index 749d8018..d410cdd0 100644
--- a/src/main/java/com/gitblit/tickets/NullTicketService.java
+++ b/src/main/java/com/gitblit/tickets/NullTicketService.java
@@ -17,6 +17,7 @@ package com.gitblit.tickets;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import com.gitblit.manager.INotificationManager;
 import com.gitblit.manager.IPluginManager;
@@ -78,6 +79,11 @@ public class NullTicketService extends ITicketService {
 	}
 
 	@Override
+	public synchronized Set<Long> getIds(RepositoryModel repository) {
+		return Collections.emptySet();
+	}
+
+	@Override
 	public synchronized long assignNewId(RepositoryModel repository) {
 		return 0L;
 	}
@@ -93,6 +99,11 @@ public class NullTicketService extends ITicketService {
 	}
 
 	@Override
+	protected List<Change> getJournalImpl(RepositoryModel repository, long ticketId) {
+		return null;
+	}
+
+	@Override
 	public boolean supportsAttachments() {
 		return false;
 	}