From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/models/ServerSettings.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/models/ServerSettings.java b/src/com/gitblit/models/ServerSettings.java
index 3aae2e3..27199b4 100644
--- a/src/com/gitblit/models/ServerSettings.java
+++ b/src/com/gitblit/models/ServerSettings.java
@@ -35,6 +35,16 @@
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>();
}
@@ -44,10 +54,16 @@
}
public void add(SettingModel setting) {
- settings.put(setting.name, setting);
+ if (setting != null) {
+ settings.put(setting.name, setting);
+ }
}
public SettingModel get(String key) {
return settings.get(key);
}
+
+ public boolean hasKey(String key) {
+ return settings.containsKey(key);
+ }
}
--
Gitblit v1.9.1