From cc5ad8d53bcf953eb60e11dcf72aa9f69ec043f3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Oct 2011 21:03:52 -0400
Subject: [PATCH] Merge branch 'master' into rpc
---
docs/01_setup.mkd | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/docs/01_setup.mkd b/docs/01_setup.mkd
index 37605c9..125bac2 100644
--- a/docs/01_setup.mkd
+++ b/docs/01_setup.mkd
@@ -32,7 +32,7 @@
### Creating your own Self-Signed Certificate
Gitblit GO automatically generates an ssl certificate for you that is bound to *localhost*.
-Remote Eclipse/EGit/JGit clients (<= 1.0.0) will fail to communicate using this certificate because JGit always verifies the hostname of the certificate, regardless of the *http.sslVerify=false* client-side setting.
+Remote Eclipse/EGit/JGit clients (<= 1.1.0) will fail to communicate using this certificate because JGit always verifies the hostname of the certificate, regardless of the *http.sslVerify=false* client-side setting.
The EGit failure message is something like:
@@ -130,7 +130,7 @@
accessRestriction = clone
isFrozen = false
showReadme = false
- excludeFromFederation = false
+ federationStrategy = FEDERATE_THIS
isFederated = false
federationSets =
@@ -171,6 +171,16 @@
%BEGINCODE%
public interface IUserService {
+ /**
+ * Setup the user service.
+ *
+ * @param settings
+ * @since 0.6.1
+ */
+ @Override
+ public void setup(IStoredSettings settings) {
+ }
+
/**
* Does the user service support cookie authentication?
*
@@ -307,7 +317,7 @@
**NOTE:**<br/>
The default self-signed certificate generated by Gitlbit GO is bound to *localhost*.<br/>
If you are using Eclipse/EGit/JGit clients, you will have to generate your own certificate that specifies the exact hostname used in your clone/push url.<br/>
-You must do this because Eclipse/EGit/JGit (<= 1.0.0) always verifies certificate hostnames, regardless of the *http.sslVerify=false* client-side setting.
+You must do this because Eclipse/EGit/JGit (<= 1.1.0) always verifies certificate hostnames, regardless of the *http.sslVerify=false* client-side setting.
- Eclipse/EGit/JGit
1. Window->Preferences->Team->Git->Configuration
--
Gitblit v1.9.1