From 6ec71bc27f23c89f84bfb662ce180af3a9691dd8 Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 27 Oct 2014 10:46:05 -0400 Subject: Fix PluginManager not properly respecting --noverify --- releases.moxie | 2 ++ src/main/java/com/gitblit/manager/PluginManager.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/releases.moxie b/releases.moxie index 446d1619..97d27bd1 100644 --- a/releases.moxie +++ b/releases.moxie @@ -12,12 +12,14 @@ r26: { 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/main/java/com/gitblit/manager/PluginManager.java b/src/main/java/com/gitblit/manager/PluginManager.java index 2ee48558..5e25caa1 100644 --- a/src/main/java/com/gitblit/manager/PluginManager.java +++ b/src/main/java/com/gitblit/manager/PluginManager.java @@ -421,6 +421,10 @@ public class PluginManager implements IPluginManager, PluginStateListener { 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"); -- cgit v1.2.3 From 3f37176a1489a553422f17a05a79374e7815f025 Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 27 Oct 2014 11:28:03 -0400 Subject: Documentation --- build.xml | 4 ++++ src/site/siteindex.mkd | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index fa02ee32..99c2966e 100644 --- a/build.xml +++ b/build.xml @@ -581,6 +581,10 @@ + + + + diff --git a/src/site/siteindex.mkd b/src/site/siteindex.mkd index aae25c89..ae954bfa 100644 --- a/src/site/siteindex.mkd +++ b/src/site/siteindex.mkd @@ -22,7 +22,7 @@ - + @@ -67,7 +67,7 @@ Gitblit blends elements of GitHub, BitBucket, and Gerrit to provide a streamline ### 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 @@ Administrators can create and manage all repositories, user accounts, and teams ### 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 -- cgit v1.2.3 From 5e0491c607e53cf9c9161df52c895d85c85f6782 Mon Sep 17 00:00:00 2001 From: James Moger Date: Tue, 28 Oct 2014 09:30:18 -0400 Subject: Prepare 1.6.2 release --- build.moxie | 6 +++--- releases.moxie | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.moxie b/build.moxie index 9e30c2c5..7610079b 100644 --- a/build.moxie +++ b/build.moxie @@ -10,12 +10,12 @@ name: Gitblit 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' diff --git a/releases.moxie b/releases.moxie index 97d27bd1..c2b633ab 100644 --- a/releases.moxie +++ b/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: ~ @@ -1556,6 +1556,6 @@ r1: { - James Moger } -snapshot: &r26 -release: &r25 -releases: &r[1..25] +snapshot: ~ +release: &r26 +releases: &r[1..26] -- cgit v1.2.3
LicenseApache License 2.0
SourcesGitHub & GoogleCode
SourcesGitHub
IssuesGoogleCode
DiscussionGitblit Group
Google+Gitblit+