From 4ff1429245b3748372643251a92d71821f257ccf Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 17 Mar 2014 09:36:09 -0400 Subject: [PATCH] Merged #33 "Merge overrides in addition to merging the normal settings" --- src/main/java/com/gitblit/models/ServerSettings.java | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gitblit/models/ServerSettings.java b/src/main/java/com/gitblit/models/ServerSettings.java index 92d5c31..07e703b 100644 --- a/src/main/java/com/gitblit/models/ServerSettings.java +++ b/src/main/java/com/gitblit/models/ServerSettings.java @@ -37,14 +37,6 @@ public List<String> pushScripts; - public boolean supportsCredentialChanges; - - public boolean supportsDisplayNameChanges; - - public boolean supportsEmailAddressChanges; - - public boolean supportsTeamMembershipChanges; - public ServerSettings() { settings = new TreeMap<String, SettingModel>(); } -- Gitblit v1.9.1