From 1501a6774ebcb427c50e740f2c4b36f4b8967782 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 28 Oct 2014 09:55:10 -0400
Subject: [PATCH] Merge release 1.6.2

---
 src/site/siteindex.mkd |    6 +++---
 releases.moxie         |    4 +++-
 build.xml              |    4 ++++
 build.moxie            |    4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/build.moxie b/build.moxie
index d6524d6..a8d8496 100644
--- a/build.moxie
+++ b/build.moxie
@@ -14,8 +14,8 @@
 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'
diff --git a/build.xml b/build.xml
index 31d7f60..ef76b20 100644
--- a/build.xml
+++ b/build.xml
@@ -587,6 +587,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" />
diff --git a/releases.moxie b/releases.moxie
index ba7a870..145ea77 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -45,7 +45,7 @@
 r26: {
     title: Gitblit 1.6.2 released
     id: 1.6.2
-    date: ${project.buildDate}
+    date: 2014-10-28
     note: ~
     html: ~
     text: ~
@@ -53,12 +53,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
 }
 
 #
diff --git a/src/site/siteindex.mkd b/src/site/siteindex.mkd
index aae25c8..ae954bf 100644
--- a/src/site/siteindex.mkd
+++ b/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
 

--
Gitblit v1.9.1