From 6be15a1cac2f98585174f501879c3685ef2a54b6 Mon Sep 17 00:00:00 2001
From: mrbytes <eguervos@msn.com>
Date: Sat, 08 Mar 2014 12:10:58 -0500
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit
---
src/main/java/com/gitblit/models/TicketModel.java | 2 +-
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 1ff55dd..5fd1ed9 100644
--- a/src/main/java/com/gitblit/models/TicketModel.java
+++ b/src/main/java/com/gitblit/models/TicketModel.java
@@ -1207,7 +1207,7 @@
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() {
--
Gitblit v1.9.1