From c9afc9ed01dbc6b74ecb2734d2cd7ed943b5d643 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 07 Mar 2015 09:30:58 -0500
Subject: [PATCH] Merged #245 "Strip line breaks from pasted SSH keys"
---
src/main/java/com/gitblit/models/TicketModel.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/models/TicketModel.java b/src/main/java/com/gitblit/models/TicketModel.java
index f843e99..a4880ea 100644
--- a/src/main/java/com/gitblit/models/TicketModel.java
+++ b/src/main/java/com/gitblit/models/TicketModel.java
@@ -637,7 +637,7 @@
}
public boolean hasComment() {
- return comment != null && !comment.isDeleted();
+ return comment != null && !comment.isDeleted() && comment.text != null;
}
public Comment comment(String text) {
@@ -1226,13 +1226,13 @@
}
public static enum Status {
- New, Open, Closed, Resolved, Fixed, Merged, Wontfix, Declined, Duplicate, Invalid, Abandoned, On_Hold;
+ New, Open, Closed, Resolved, Fixed, Merged, Wontfix, Declined, Duplicate, Invalid, Abandoned, On_Hold, No_Change_Required;
- public static Status [] requestWorkflow = { Open, Resolved, Declined, Duplicate, Invalid, Abandoned, On_Hold };
+ public static Status [] requestWorkflow = { Open, Resolved, Declined, Duplicate, Invalid, Abandoned, On_Hold, No_Change_Required };
- public static Status [] bugWorkflow = { Open, Fixed, Wontfix, Duplicate, Invalid, Abandoned, On_Hold };
+ public static Status [] bugWorkflow = { Open, Fixed, Wontfix, Duplicate, Invalid, Abandoned, On_Hold, No_Change_Required };
- public static Status [] proposalWorkflow = { Open, Resolved, Declined, Abandoned, On_Hold };
+ public static Status [] proposalWorkflow = { Open, Resolved, Declined, Abandoned, On_Hold, No_Change_Required };
public static Status [] milestoneWorkflow = { Open, Closed, Abandoned, On_Hold };
--
Gitblit v1.9.1