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/wicket/GitBlitWebApp.properties | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index 295db8a..57ccd68 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -272,4 +272,6 @@
gb.proposalError = Sorry, {0} reports that an unexpected error occurred!
gb.failedToSendProposal = Failed to send proposal!
gb.userServiceDoesNotPermitAddUser = {0} does not permit adding a user account!
-gb.userServiceDoesNotPermitPasswordChanges = {0} does not permit password changes!
\ No newline at end of file
+gb.userServiceDoesNotPermitPasswordChanges = {0} does not permit password changes!
+gb.displayName = display name
+gb.emailAddress = email address
\ No newline at end of file
--
Gitblit v1.9.1