Merge branch 'ticket/182' into develop

James Moger

2014-09-17 588a4f925f5ac6ff80674c047bf147528cb8bbb3

Merge branch 'ticket/182' into develop

 src/main/java/com/gitblit/models/TicketModel.java

@@ -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 };


 src/main/java/com/gitblit/wicket/TicketsUI.java

@@ -93,6 +93,7 @@
            css = "aui-lozenge-complete";
            break;
        case On_Hold:
        case No_Change_Required:
            css = "aui-lozenge-current";
            break;
        default:
@@ -122,6 +123,7 @@
            css = "resolution-complete";
            break;
        case On_Hold:
        case No_Change_Required:
            css = "resolution-current";
            break;
        default: