summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-03-06 14:40:08 -0500
committerJames Moger <james.moger@gitblit.com>2014-03-06 14:40:08 -0500
commit14747a9a356230cd9964a69c734830681451807e (patch)
treef1a1f18386e09f741806ba2babeb0dee29184d6f /src
parent3dfe07a2b73f7ccf53cb546cc6e374bd13662a5c (diff)
downloadgitblit-14747a9a356230cd9964a69c734830681451807e.tar.gz
gitblit-14747a9a356230cd9964a69c734830681451807e.zip
Allow resolve for proposal workflows
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/gitblit/models/TicketModel.java2
1 files changed, 1 insertions, 1 deletions
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() {