From c4a443e8bdd6f85265f4c460686bc44ddc8183e1 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 09 May 2014 09:56:22 -0400
Subject: [PATCH] Merged #67 "Allow disabling repository deletion"

---
 src/main/distrib/data/gitblit.properties |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/distrib/data/gitblit.properties b/src/main/distrib/data/gitblit.properties
index 30e9789..7d74c28 100644
--- a/src/main/distrib/data/gitblit.properties
+++ b/src/main/distrib/data/gitblit.properties
@@ -766,7 +766,7 @@
 # SINCE 0.5.0
 web.allowCookieAuthentication = true
 
-# Allow deleting of non empty repositories through the user interface.
+# Allow deletion of non-empty repositories. This is enforced for all delete vectors.
 #
 # SINCE 1.6.0
 web.allowDeletingNonEmptyRepositories = true
@@ -1415,6 +1415,11 @@
 # use SMTPs flag
 mail.smtps = false
 
+# use STARTTLS flag
+#
+# SINCE 1.6.0
+mail.starttls = false
+
 # if your smtp server requires authentication, supply the credentials here
 #
 # SINCE 0.6.0

--
Gitblit v1.9.1