From 6d298ca7046b945869278992694069329eb37c1a Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 07 Mar 2014 07:55:03 -0500 Subject: [PATCH] Documentation --- src/site/upgrade_express.mkd | 5 +++++ src/main/java/com/gitblit/git/PatchsetReceivePack.java | 3 +-- src/site/upgrade_war.mkd | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitblit/git/PatchsetReceivePack.java b/src/main/java/com/gitblit/git/PatchsetReceivePack.java index c0ab8ae..ee8295c 100644 --- a/src/main/java/com/gitblit/git/PatchsetReceivePack.java +++ b/src/main/java/com/gitblit/git/PatchsetReceivePack.java @@ -664,8 +664,7 @@ sendError(" 1. you created the ticket"); sendError(" 2. you created the first patchset"); sendError(" 3. you are specified as responsible for the ticket"); - sendError(" 4. you are listed as a reviewer for the ticket"); - sendError(" 5. you have push (RW) permission to {0}", repository.name); + sendError(" 4. you have push (RW) permissions to {0}", repository.name); sendError(""); sendRejection(cmd, "not permitted to push to ticket {0,number,0}", ticket.number); return null; diff --git a/src/site/upgrade_express.mkd b/src/site/upgrade_express.mkd index 374cd82..9e1eed9 100644 --- a/src/site/upgrade_express.mkd +++ b/src/site/upgrade_express.mkd @@ -16,3 +16,8 @@ - Added SparkleShareInviteServlet - Added EnforceAuthenticationFilter - Moved GitServlet + +### 1.4.0 web.xml + +- Changed baseFolder from a context-parameter to a JNDI env-entry +- Added pt servlet \ No newline at end of file diff --git a/src/site/upgrade_war.mkd b/src/site/upgrade_war.mkd index 23003be..34ffd75 100644 --- a/src/site/upgrade_war.mkd +++ b/src/site/upgrade_war.mkd @@ -15,3 +15,6 @@ 5. Manually apply any changes you made to your original web.xml file to the gitblit.properties file you copied to your data folder 6. Edit the new WAR's `WEB-INF/web.xml` file and set the *baseFolder* context parameter to your external baseFolder. +## Upgrading Gitblit WAR (1.4.0+) + +The *baseFolder* context parameter has been replaced with a *baseFolder* JNDI env-entry. This means you can define the *baseFolder* from the administrative console of your servlet container and not have to manipulate anything in the web.xml file. \ No newline at end of file -- Gitblit v1.9.1