From 0fbf8052cc0c6272baf64d8de2d07d2cdbf3a287 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 07 May 2014 14:13:08 -0400
Subject: [PATCH] Merge branch 'master' into develop
---
README.markdown | 2 +
src/site/siteindex.mkd | 12 +----
releases.moxie | 26 +++++++++++--
src/site/faq.mkd | 8 ++++
build.xml | 14 ++----
build.moxie | 4 +-
src/site/setup_go.mkd | 4 +
7 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/README.markdown b/README.markdown
index fb8632f..348afae 100644
--- a/README.markdown
+++ b/README.markdown
@@ -4,6 +4,8 @@
Gitblit is an open source, pure Java Git solution for managing, viewing, and serving [Git](http://git-scm.com) repositories.
More information about Gitblit can be found [here](http://gitblit.com).
+[  ](https://bintray.com/gitblit/releases/stable/_latestVersion)
+
License
-------
diff --git a/build.moxie b/build.moxie
index b676917..d834eab 100644
--- a/build.moxie
+++ b/build.moxie
@@ -14,8 +14,8 @@
inceptionYear: 2011
# Current stable release
-releaseVersion: 1.5.0
-releaseDate: 2014-04-17
+releaseVersion: 1.5.1
+releaseDate: 2014-05-07
# Project urls
url: 'http://gitblit.com'
diff --git a/build.xml b/build.xml
index 2fd49b8..9050426 100644
--- a/build.xml
+++ b/build.xml
@@ -52,7 +52,7 @@
<property name="maven.directory" value="${basedir}/../gitblit-maven" />
<!-- Download links -->
- <property name="gc.url" value="http://dl.bintray.com/jamesmoger/generic/" />
+ <property name="gc.url" value="http://dl.bintray.com/gitblit/releases/" />
</target>
@@ -611,17 +611,14 @@
<divider />
<link name="API Library" src="${gc.url}gbapi-${project.releaseVersion}.zip" />
<divider />
- <link name="Bintray (1.4.0+)" src="https://bintray.com/jamesmoger/generic/Gitblit" />
+ <link name="Bintray (1.4.0+)" src="https://bintray.com/gitblit/releases/gitblit" />
<link name="GoogleCode (pre-1.4.0)" src="https://code.google.com/p/gitblit/downloads/list?can=1" />
<divider />
<link name="Maven Repository" src="${project.mavenUrl}" />
</menu>
<menu name="links">
- <link name="Gitblit Demo (RELEASE)" src="https://demo-gitblit.rhcloud.com" />
- <link name="Gitblit Next (SNAPSHOT)" src="https://next-gitblit.rhcloud.com" />
- <divider />
- <link name="Gitblit (Self-Hosted)" src="https://dev.gitblit.com" />
+ <link name="dev.gitblit.com (self-hosted)" src="https://dev.gitblit.com" />
<divider />
<link name="Plugin Registry" src="http://plugins.gitblit.com" />
<divider />
@@ -917,8 +914,7 @@
<page name="older releases" src="releasehistory.mkd" />
</menu>
<menu name="links">
- <link name="Gitblit Demo (RELEASE)" src="https://demo-gitblit.rhcloud.com" />
- <link name="Gitbilt Next (SNAPSHOT)" src="https://next-gitblit.rhcloud.com" />
+ <link name="dev.gitblit.com (self-hosted)" src="https://dev.gitblit.com" />
<divider />
<link name="Plugin Registry" src="http://plugins.gitblit.com" />
<divider />
@@ -1009,7 +1005,7 @@
<sequential>
<echo>uploading @{source} to Bintray</echo>
<exec executable="curl">
- <arg line="--silent --show-error -T @{source} -u${bintray.username}:${bintray.apikey} https://api.bintray.com/content/${bintray.username}/generic/${project.name}/${project.version}/@{target}"></arg>
+ <arg line="--silent --show-error -T @{source} -u${bintray.username}:${bintray.apikey} https://api.bintray.com/content/gitblit/releases/gitblit/${project.version}/@{target}"></arg>
</exec>
</sequential>
</macrodef>
diff --git a/releases.moxie b/releases.moxie
index 8aafab1..aac46f0 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -1,10 +1,28 @@
#
# ${project.version} release
#
-r23: {
+r24: {
title: ${project.name} ${project.version} released
id: ${project.version}
date: ${project.buildDate}
+ note: ~
+ html: ~
+ text: ~
+ security: ~
+ fixes: ~
+ changes: ~
+ additions: ~
+ dependencyChanges: ~
+ contributors: ~
+}
+
+#
+# 1.5.1 release
+#
+r23: {
+ title: Gitblit 1.5.1 released
+ id: 1.5.1
+ date: 2014-05-07
note: ~
html: ~
text: ~
@@ -1311,6 +1329,6 @@
- James Moger
}
-snapshot: &r23
-release: &r22
-releases: &r[1..22]
+snapshot: &r24
+release: &r23
+releases: &r[1..23]
diff --git a/src/site/faq.mkd b/src/site/faq.mkd
index 1b522f8..160808d 100644
--- a/src/site/faq.mkd
+++ b/src/site/faq.mkd
@@ -1,5 +1,13 @@
## Troubleshooting
+### push failed for branch (n/a (unpacker error))
+
+This is a bug in JGit (issue-408). TLDR: Newer git clients are optimized to send less data on the wire. JGit expects complete data to be sent, but there are scenarios where native git can optimize-out sending objects. By default, JGit requires everything sent be complete and referenceable.
+
+If you experience this, the workaround is to temporarily disable the reachable check for the receive pack, push, and then re-enable the setting.
+
+ git.checkReferencedObjectsAreReachable = false
+
### Eclipse/Egit/JGit complains that it "can't open upload pack"?
There are a few ways this can occur:
diff --git a/src/site/setup_go.mkd b/src/site/setup_go.mkd
index 51ca295..f099cc0 100644
--- a/src/site/setup_go.mkd
+++ b/src/site/setup_go.mkd
@@ -5,7 +5,7 @@
2. The server itself is configured through a simple text file.
Open `data/gitblit.properties` in your favorite text editor and make sure to review and set:
- *server.httpPort* and *server.httpsPort*
- - *server.storePassword*
+ - *server.storePassword* (do not enter *#* characters)
**https** is strongly recommended because passwords are insecurely transmitted form your browser/git client using Basic authentication!
- *git.packedGitLimit* (set larger than the size of your largest repository)
- *git.streamFileThreshold* (set larger than the size of your largest committed file)
@@ -39,6 +39,8 @@
If you want to serve your repositories to another machine over https then you will want to generate a new certificate for the hostname or ip address you are serving from.
+**NOTE:** The Gitblit Authority is a GUI tool and will require X11 forwarding on headless UNIX boxes.
+
1. `authority.cmd` or `java -jar authority.jar --baseFolder data`
2. Click the *new ssl certificate* button (red rosette in the toolbar in upper left of window)
3. Enter the hostname or ip address
diff --git a/src/site/siteindex.mkd b/src/site/siteindex.mkd
index 5f58fb0..88bb3f3 100644
--- a/src/site/siteindex.mkd
+++ b/src/site/siteindex.mkd
@@ -6,7 +6,7 @@
<div style="padding:5px;"><a style="width:175px;text-decoration:none;" class="btn btn-danger" href="%GCURL%gitblit-${project.releaseVersion}.war">Download Gitblit WAR</a></div>
<div style="padding:5px;"><a style="width:175px;text-decoration:none;" class="btn btn-info" href="%GCURL%express-${project.releaseVersion}.zip">Download Gitblit Express</a></div>
<div style="padding:5px;"><a style="width:175px;text-decoration:none;" class="btn btn-primary" href="%GCURL%manager-${project.releaseVersion}.zip">Download Gitblit Manager</a></div>
- <a href="screenshots.html" title="Screenshots"><img style="margin-top:5px;border:1px solid #ccc;" src="thumbs/00.png" alt="Screenshots" /></a>
+ <a href='https://bintray.com/gitblit/releases/gitblit/view?source=watch' alt='Get automatic notifications about new "stable" versions'><img src='https://www.bintray.com/docs/images/bintray_badge_color.png'></a>
</div>
<div style="padding-top:5px;">
@@ -30,8 +30,6 @@
Gitblit is an open-source, pure Java stack for managing, viewing, and serving [Git][git] repositories.
It's designed primarily as a tool for small workgroups who want to host centralized repositories.
-You can browse the [stable demo site](https://demo-gitblit.rhcloud.com) or the [snapshot demo site](https://next-gitblit.rhcloud.com), both are hosted on [RedHat's OpenShift][rhcloud] cloud service.
-
### GO: Single-Stack Solution
*Gitblit GO* is an integrated, single-stack solution based on Jetty.
@@ -40,17 +38,11 @@
This is what you should download if you want to go from zero to Git in less than 5 mins.
-All dependencies are bundled.
-
### WAR: For Your Servlet Container
*Gitblit WAR* is what you should download if you already have a servlet container available that you wish to use. Jetty 6/7/8 and Tomcat 6/7 are known to work. Generally, any Servlet 2.5 or Servlet 3.0 container should work.
-All dependencies are bundled.
-
### Express: For the Cloud
*Gitblit Express* is a prepared distribution for [RedHat's OpenShift][rhcloud] cloud service.
-
-All dependencies are bundled.
### You decide how to use Gitblit
@@ -62,9 +54,11 @@
Administrators can create and manage all repositories, user accounts, and teams from the *Web UI*.
Administrators can create and manage all repositories, user accounts, and teams from the *JSON RPC interface* using the [Gitblit Manager](http://code.google.com/p/gitblit/downloads/detail?name=%MANAGER%) or your own custom tooling.
+Administrators can create and manage all repositories, user accounts, and teams from the *command-line* using the [Powertools plugin](https://github.com/gitblit/gitblit-powertools-plugin).
### Integration with Your Infrastructure
+- Extendable by plugins
- Groovy push hook scripts
- Pluggable user service mechanism
- LDAP authentication with optional LDAP-controlled Team memberships
--
Gitblit v1.9.1