Merge release 1.6.2

James Moger

2014-10-28 ae5f9539272da20f3dd50c1fef05a15a417def93

Merge release 1.6.2

 build.moxie

@@ -10,12 +10,12 @@
description: pure Java Git solution
groupId: com.gitblit
artifactId: gitblit
version: 1.6.2-SNAPSHOT
version: 1.6.2
inceptionYear: 2011

# Current stable release
releaseVersion: 1.6.1
releaseDate: 2014-10-20
releaseVersion: 1.6.2
releaseDate: 2014-10-28

# Project urls
url: 'http://gitblit.com'

 build.xml

@@ -581,6 +581,10 @@
                    <link name="Google+" src="${project.socialNetworkUrl}" />

                    <link name="Twitter" src="https://twitter.com/gitblit" />

                    <link name="Ohloh" src="http://www.ohloh.net/p/gitblit" />

                    <divider />

                    <link name="Gitblit Tickets screencast" src="https://vimeo.com/86164723" />

                    <link name="Gitblit SSH and Plugin Management asciicast" src="https://asciinema.org/a/9342" />

                    <link name="GitMinutes #29: James Moger on Gitblit" src="http://episodes.gitminutes.com/2014/05/gitminutes-29-james-moger-on-gitblit.html" />

                    <divider />

                    <link name="+JamesMoger" src="https://plus.google.com/+JamesMoger" />

                    <link name="@JamesMoger" src="https://twitter.com/JamesMoger" />


 releases.moxie

@@ -1,10 +1,10 @@
#
# ${project.version} release
# 1.6.2 release
#
r26: {
    title: ${project.name} ${project.version} released
    id: ${project.version}
    date: ${project.buildDate}
    title: Gitblit 1.6.2 released
    id: 1.6.2
    date: 2014-10-28
    note: ~
    html: ~
    text: ~
@@ -12,12 +12,14 @@
    fixes:
    - Fix French translation (pr-224, ticket-210)
    - Fix raw servlet trashing paths with spaces (ticket-211)
    - Fix PluginManager not properly respecting --noverify (ticket-209)
    changes: ~
    additions: ~
    dependencyChanges: ~
    contributors:
    - Pierre Templier
    - Barry Roberts 
    - Jan Šmucr
}

#
@@ -1554,6 +1556,6 @@
    - James Moger
}

snapshot: &r26
release: &r25
releases: &r[1..25]
snapshot: ~
release: &r26
releases: &r[1..26]

 src/main/java/com/gitblit/manager/PluginManager.java

@@ -421,6 +421,10 @@
    protected File download(String url, boolean verifyChecksum) throws IOException {
        File file = downloadFile(url);

        if (!verifyChecksum) {
            return file;
        }

        File sha1File = null;
        try {
            sha1File = downloadFile(url + ".sha1");

 src/site/siteindex.mkd

@@ -22,7 +22,7 @@
    <table class="table condensed-table">

        <tbody>

        <tr><th>License</th><td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License 2.0</a></td></tr>

        <tr><th>Sources</th><td><a href="${project.scmUrl}">GitHub</a> &amp; <a href="http://code.google.com/p/gitblit/source/list">GoogleCode</a></td></tr>		
        <tr><th>Sources</th><td><a href="${project.scmUrl}">GitHub</a></td></tr>		
        <tr><th>Issues</th><td><a href="${project.issuesUrl}">GoogleCode</a></td></tr>

        <tr><th>Discussion</th><td><a href="${project.forumUrl}">Gitblit Group</a></td></tr>

        <tr><th>Google+</th><td><a href="${project.socialNetworkUrl}">Gitblit+</a></td></tr>

@@ -67,7 +67,7 @@
### Easy Remote Management



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 *JSON RPC interface* using the [Gitblit Manager](%GCURL%manager-${project.releaseVersion}.zip) or your own custom tooling. 
Administrators can create and manage all repositories, user accounts, and teams from the *command-line* using SSH & the [Powertools plugin](https://github.com/gitblit/gitblit-powertools-plugin).



### Integration with Your Infrastructure

@@ -87,7 +87,7 @@


### Backup Strategy



Gitblit includes a backup mechanism (*federation*) which can be used to backup repositories and, optionally, user accounts, team definitions, server settings, & Groovy push hook scripts from your Gitblit instance to another Gitblit instance or to a [Gitblit Federation Client](http://code.google.com/p/gitblit/downloads/detail?name=%FEDCLIENT%).  Similarly, you can use the federation mechanism to aggregate individual workspace Gitblit instances to a common, centralized server.

Gitblit includes a backup mechanism (*federation*) which can be used to backup repositories and, optionally, user accounts, team definitions, server settings, & Groovy push hook scripts from your Gitblit instance to another Gitblit instance or to a [Gitblit Federation Client](%GCURL%fedclient-${project.releaseVersion}.zip).  Similarly, you can use the federation mechanism to aggregate individual workspace Gitblit instances to a common, centralized server.



### Java Runtime Requirement