From: James Moger <james.moger@gitblit.com>
Date: Thu, 6 Mar 2014 19:40:08 +0000 (-0500)
Subject: Allow resolve for proposal workflows
X-Git-Tag: v1.4.0~33
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=14747a9a356230cd9964a69c734830681451807e;p=gitblit.git

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 1ff55ddb..5fd1ed95 100644
--- 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() {