From 355cbb8f10527032e9c9cedbef5b68f118418d68 Mon Sep 17 00:00:00 2001
From: Florian Zschocke <florian.zschocke@cycos.com>
Date: Mon, 23 Jun 2014 04:12:19 +0200
Subject: Add merge type setting to repository page.

The merge type is a per repository setting. Add it to the edit page.
---
 src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html')

diff --git a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
index 7a55b9f5..2c881efc 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html
@@ -123,7 +123,8 @@
 			<div wicket:id="acceptNewTickets"></div>
 			<div wicket:id="requireApproval"></div>
 			<div wicket:id="mergeTo"></div>
-		
+			<div wicket:id="mergeType"></div>
+
 		</div>
 				
 		<!-- federation -->
-- 
cgit v1.2.3