From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0

---
 src/site/tickets_overview.mkd |   25 ++++++-------------------
 1 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/site/tickets_overview.mkd b/src/site/tickets_overview.mkd
index 485ca06..14e4ab9 100644
--- a/src/site/tickets_overview.mkd
+++ b/src/site/tickets_overview.mkd
@@ -114,36 +114,23 @@
 
 Additionally, because the patchset is not linked to a user's personal fork it is possible to allow others to collaborate on development.
 
-## Status
+#### Features
 
-The Tickets feature is highly functional but there are several areas which need further refinements.
-
-#### What is working
-
+- My Tickets page
 - Ticket creation and editing
-- Ticket creation on patchset push
+- Ticket creation on patchset push (proposal)
+- Branch-based pull-requests
 - Comments with Markdown syntax support
 - Rich email notifications
 - Fast-forward patchset updates and patchset rewrites
 - Voting
 - Watching
 - Mentions
-- Partial milestone support
+- Milestones
 - Querying
 - Searching
 - Is Mergeable test on view ticket page load
+- Server-side merge
 - Close-on-push of detected merge
 - Multiple backend choices
-- Server-side merge (testing)
 
-#### TODO
-
-- Implement a My Tickets page (ticket-15)
-- Ticket Lifecycle Hooks (ticket-16)
-- CRUD pages for Milestones (ticket-17)
-- Ticket service migration tool (ticket-19)
-- Collapsible ticket description (e.g. AUI expander)
-- Edit a comment
-- Delete a comment
-- REST API for tooling
-- Client-side Markdown previews (AngularMarkdown?)

--
Gitblit v1.9.1