From 8bde5a04d27e32a03e3790e39943d685c40904f7 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 04 Jan 2013 07:55:50 -0500
Subject: [PATCH] Merge branch 'master' of https://github.com/kwoot/gitblit

---
 docs/05_roadmap.mkd |   22 ++++------------------
 1 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/docs/05_roadmap.mkd b/docs/05_roadmap.mkd
index 8688831..4ac9b47 100644
--- a/docs/05_roadmap.mkd
+++ b/docs/05_roadmap.mkd
@@ -8,38 +8,24 @@
 * Eclipse: create plugin to enumerate repositories and delegate cloning to EGit
 * Manager: support federation RPCs
 * Manager: redesign ref indicators in log, search, and activity views to support multiple local branches, remote branches, and tags
-* Gitblit: Lucene integration with multi-repository search (issue 16)
 * Gitblit: Serve repositories on root URL rather than /git (investigate JGit 1.2 GitFilter)
 
 ### TODO (medium priority)
 
 * Gitblit: editable settings page in GO/WAR
-* Gitblit: investigate create-repository-on-push.
-    * Maybe a new user role to allow this?
-    * Maybe a server setting to disable this completely?
-    * Pusher/Creator becomes repository owner and can then manipulate access lists, etc?
 * Gitblit: Clone Repository feature (issue 5)
     * optional scheduled pulls
     * optional automatic push to origin/remotes?
     * optional manual push to origin/remotes?
 * Gitblit: Repository regex substitutions should be stored in .git/.config, not gitblit.properties
-* Gitblit: Consider allowing git:// protocol using JGit
-    * new setting *git.allowGitProtocol* to enable/disable git:// protocol
-    * unrestricted repositories would have anonymous RW git:// access
-    * push-restricted repositories would have anonymous R git:// access
-    * clone-restricted repositories would prohibit git:// access
-    * view-restricted repositories would prohibit git:// access
 
 ### IDEAS
 
+* Gitblit: Pull requests
+* Gitblit: Watch/Star like github with personalized activity feed
+* Gitblit: Push database or orphan branch
 * Gitblit: Re-use the EGit branch visualization table cell renderer as some sort of servlet
-* Gitblit: Support personal repositories (~username/repo)
 * Gitblit: diff should highlight inserted/removed fragment compared to original line
-* Gitblit: implement branch permission controls as Groovy pre-receive script.  
-*Maintain permissions text file similar to a gitolite configuration file or svn authz file.*
-* Gitblit: consider user-subscribed email notifications for a repository branch.  
-* Gitblit: aggregate RSS feeds by tag or subfolder
+* Gitblit: respect Gerrit branch permissions
 * Gitblit: Consider creating more Git model objects and exposing them via the JSON RPC interface to allow inspection/retrieval of Git commits, Git trees, etc from Gitblit.
 * Gitblit: Blame coloring by author (issue 2)
-* Gitblit: View binary files in blob page (issue 6)
-* Gitblit: Stronger ticgit integration (issue 8)

--
Gitblit v1.9.1