From 410c92f5c71c93cd2b4b0a1d9ee4067c34b80c66 Mon Sep 17 00:00:00 2001
From: Eddy Young <jeyoung@priscimon.com>
Date: Fri, 22 May 2015 03:47:09 -0400
Subject: [PATCH] Merge branch 'develop' into ticket-57_develop
---
src/main/java/com/gitblit/models/ServerSettings.java | 12 ++++--------
1 files changed, 4 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..4e9216a 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>();
}
@@ -66,4 +58,8 @@
public boolean hasKey(String key) {
return settings.containsKey(key);
}
+
+ public SettingModel remove(String key) {
+ return settings.remove(key);
+ }
}
--
Gitblit v1.9.1