From 35a925961d5df5cbdf5ddb7df80b616064b3e0e9 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 15 Jun 2015 12:27:14 -0400
Subject: [PATCH] Merged #258 "Create an avatar provider that defaults to Gravatar"

---
 src/main/distrib/data/defaults.properties |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/main/distrib/data/defaults.properties b/src/main/distrib/data/defaults.properties
index aa0d2cf..cc42d90 100644
--- a/src/main/distrib/data/defaults.properties
+++ b/src/main/distrib/data/defaults.properties
@@ -976,8 +976,6 @@
 web.allowGravatar = true
 
 # Define which class will generate the avatar URL.
-# This class must inherit from com.gitblit.AvatarGenerator
-# It must use a no argument constructor
 #
 # SINCE 1.7.0
 web.avatarClass = com.gitblit.GravatarGenerator
@@ -1175,6 +1173,24 @@
 # SINCE 0.5.0
 web.otherUrls = 
 
+# Should HTTP/HTTPS URLs be displayed if the git servlet is enabled?
+# default: true
+#
+# SINCE 1.7.0
+web.showHttpServletUrls = true
+
+# Should git URLs be displayed if the git daemon is enabled?
+# default: true
+#
+# SINCE 1.7.0
+web.showGitDaemonUrls = true
+
+# Should SSH URLs be displayed if the SSH daemon is enabled?
+# default: true
+#
+# SINCE 1.7.0
+web.showSshDaemonUrls = true
+
 # Should app-specific clone links be displayed for SourceTree, SparkleShare, etc?
 #
 # SINCE 1.3.0

--
Gitblit v1.9.1