From d1231c63669f4bc3643985b9032de7f998612e08 Mon Sep 17 00:00:00 2001
From: Jason Pyeron <jpyeron@pdinc.us>
Date: Sun, 19 Aug 2012 21:35:52 -0400
Subject: [PATCH] fixed build to allow builds where a proxy is needed for access to outside resources see: http://ant.apache.org/manual/proxy.html

---
 src/com/gitblit/models/ServerSettings.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/com/gitblit/models/ServerSettings.java b/src/com/gitblit/models/ServerSettings.java
index 72a7f00..27199b4 100644
--- a/src/com/gitblit/models/ServerSettings.java
+++ b/src/com/gitblit/models/ServerSettings.java
@@ -36,6 +36,14 @@
 	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>();
@@ -46,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