From b6db0de02630a131005cc73e126db42a37330710 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 05 May 2012 15:37:28 -0400
Subject: [PATCH] Reordered settings model loading to avoid WAR null pointer
---
src/com/gitblit/models/ServerSettings.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/com/gitblit/models/ServerSettings.java b/src/com/gitblit/models/ServerSettings.java
index 3aae2e3..3658096 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>();
}
--
Gitblit v1.9.1