From 396e9bb50d7eca0d96da2c5fc5177a22f78d30b7 Mon Sep 17 00:00:00 2001
From: Sascha Vogt <s.vogt@seeburger.de>
Date: Wed, 18 Jun 2014 08:07:55 -0400
Subject: [PATCH] Fix NPE when there are two repositories which only differ in case

---
 src/main/java/com/gitblit/wicket/pages/UserPage.html |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.html b/src/main/java/com/gitblit/wicket/pages/UserPage.html
index 0926787..6bdd3ce 100644
--- a/src/main/java/com/gitblit/wicket/pages/UserPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/UserPage.html
@@ -20,6 +20,7 @@
 				<ul class="nav nav-tabs">
 					<li class="active"><a href="#repositories" data-toggle="tab"><wicket:message key="gb.repositories"></wicket:message></a></li>
 					<div wicket:id="preferencesLink"></div>
+					<div wicket:id="sshKeysLink"></div>
 				</ul>
 	
 				<!-- tab content -->
@@ -37,6 +38,9 @@
 					<!-- preferences tab -->
 					<div wicket:id="preferencesTab"></div>
 					
+					<!-- ssh keys tab -->
+					<div wicket:id="sshKeysTab"></div>
+					
 				</div>
 			</div>
 		</div>
@@ -45,6 +49,10 @@
 
 <wicket:fragment wicket:id="preferencesLinkFragment">
 	<li><a href="#preferences" data-toggle="tab"><wicket:message key="gb.preferences"></wicket:message></a></li>
+</wicket:fragment>
+
+<wicket:fragment wicket:id="sshKeysLinkFragment">
+	<li><a href="#ssh" data-toggle="tab"><wicket:message key="gb.sshKeys"></wicket:message></a></li>
 </wicket:fragment>
 
 <wicket:fragment wicket:id="preferencesTabFragment">
@@ -56,13 +64,21 @@
 		<form wicket:id="prefsForm">
 			<div wicket:id="displayName"></div>
 			<div wicket:id="emailAddress"></div>
-			<div wicket:id="language"></div>	
+			<div wicket:id="emailMeOnMyTicketChanges"></div>
+			<div wicket:id="language"></div>
+			<div wicket:id="transport"></div>
 			
 			<div class="form-actions"><input class="btn btn-appmenu" type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" /></div>
 		</form>	
 	</div>
 </wicket:fragment>
 
+<wicket:fragment wicket:id="sshKeysTabFragment">
+	<div class="tab-pane" id="ssh">
+		<div wicket:id="sshKeysPanel"></div>		
+	</div>
+</wicket:fragment>
+
 </wicket:extend>
 </body>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1