summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-03-07 07:55:03 -0500
committerJames Moger <james.moger@gitblit.com>2014-03-07 07:55:03 -0500
commit6d298ca7046b945869278992694069329eb37c1a (patch)
tree58852d17244ba4e7673ba801cf4aefad006714a2 /src
parentd68553e01d3064bbf3df25f733e3d29d1da1feca (diff)
downloadgitblit-6d298ca7046b945869278992694069329eb37c1a.tar.gz
gitblit-6d298ca7046b945869278992694069329eb37c1a.zip
Documentation
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/gitblit/git/PatchsetReceivePack.java3
-rw-r--r--src/site/upgrade_express.mkd5
-rw-r--r--src/site/upgrade_war.mkd3
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 c0ab8aeb..ee8295ca 100644
--- a/src/main/java/com/gitblit/git/PatchsetReceivePack.java
+++ b/src/main/java/com/gitblit/git/PatchsetReceivePack.java
@@ -664,8 +664,7 @@ public class PatchsetReceivePack extends GitblitReceivePack {
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 374cd821..9e1eed9d 100644
--- a/src/site/upgrade_express.mkd
+++ b/src/site/upgrade_express.mkd
@@ -16,3 +16,8 @@ These steps are necessary to ensure that you end up using the specified librarie
- 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 23003bed..34ffd758 100644
--- a/src/site/upgrade_war.mkd
+++ b/src/site/upgrade_war.mkd
@@ -15,3 +15,6 @@ If it is, move your `WEB-INF/data` folder to a location writeable by your servle
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