Allow resolve for proposal workflows

diff --git a/src/main/java/com/gitblit/models/TicketModel.java b/src/main/java/com/gitblit/models/TicketModel.java
index 1ff55ddbd5b7414e2d48676b264c53facd072a7a..5fd1ed958b05ad81bb0445c5d4a8955a5d382dd1 100644 (file)
--- a/src/main/java/com/gitblit/models/TicketModel.java
+++ b/src/main/java/com/gitblit/models/TicketModel.java
@@ -1207,7 +1207,7 @@ public class TicketModel implements Serializable, Comparable<TicketModel> {
 
                public static Status [] bugWorkflow = { Open, Fixed, Wontfix, Duplicate, Invalid, On_Hold };
 
-               public static Status [] proposalWorkflow = { Open, Declined, On_Hold};
+               public static Status [] proposalWorkflow = { Open, Resolved, Declined, On_Hold};
 
                @Override
                public String toString() {