From e0ae994e31c3a93a13c7b0141fe37dd1aac9b228 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 02 May 2012 14:36:48 -0400
Subject: [PATCH] Merge pull request #15 from mragab/java-proxy
---
src/com/gitblit/models/ServerSettings.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/models/ServerSettings.java b/src/com/gitblit/models/ServerSettings.java
index 47148d3..3658096 100644
--- a/src/com/gitblit/models/ServerSettings.java
+++ b/src/com/gitblit/models/ServerSettings.java
@@ -21,8 +21,6 @@
import java.util.Map;
import java.util.TreeMap;
-import com.gitblit.IStoredSettings;
-
/**
* Server settings represents the settings of the Gitblit server including all
* setting metadata such as name, current value, default value, description, and
@@ -37,10 +35,20 @@
private static final long serialVersionUID = 1L;
+ public List<String> pushScripts;
+
+ public boolean supportsCredentialChanges;
+
+ public boolean supportsDisplayNameChanges;
+
+ public boolean supportsEmailAddressChanges;
+
+ public boolean supportsTeamMembershipChanges;
+
public ServerSettings() {
settings = new TreeMap<String, SettingModel>();
}
-
+
public List<String> getKeys() {
return new ArrayList<String>(settings.keySet());
}
@@ -51,13 +59,5 @@
public SettingModel get(String key) {
return settings.get(key);
- }
-
- public void updateCurrentValues(IStoredSettings storedSettings) {
- for (String key : storedSettings.getAllKeys(null)) {
- if (settings.containsKey(key)) {
- settings.get(key).currentValue = storedSettings.getString(key, "");
- }
- }
}
}
--
Gitblit v1.9.1