From afc9deedc7da2b5a3d183941d63e13bfbfb7c78a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gmail.com>
Date: Wed, 09 Dec 2015 19:36:39 -0500
Subject: [PATCH] Merge pull request #983 from mrjoel/mrjoel-dotfiledetection
---
src/main/java/com/gitblit/wicket/pages/TicketPage.html | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.html b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
index aa52d8f..5ae005e 100644
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.html
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.html
@@ -33,7 +33,7 @@
<!-- DISCUSSION TAB -->
<div class="tab-pane active" id="discussion">
- <div class="row">
+ <div class="row" style="min-height: 500px;">
<!-- LEFT SIDE -->
<div class="span8">
@@ -67,6 +67,8 @@
<div style="border: 1px solid #ccc;padding: 10px;margin: 5px 0px;">
<table class="summary" style="width: 100%">
<tr><th><wicket:message key="gb.type"></wicket:message></th><td><span wicket:id="ticketType">[type]</span></td></tr>
+ <tr><th><wicket:message key="gb.priority"></wicket:message></th><td><span wicket:id="priority">[priority]</span></td></tr>
+ <tr><th><wicket:message key="gb.severity"></wicket:message></th><td><span wicket:id="severity">[severity]</span></td></tr>
<tr><th><wicket:message key="gb.topic"></wicket:message></th><td><span wicket:id="ticketTopic">[topic]</span></td></tr>
<tr><th><wicket:message key="gb.responsible"></wicket:message></th><td><span wicket:id="responsible">[responsible]</span></td></tr>
<tr><th><wicket:message key="gb.milestone"></wicket:message></th><td><span wicket:id="milestone">[milestone]</span></td></tr>
@@ -555,7 +557,6 @@
</div>
</wicket:fragment>
-
<!-- VETOED PATCHSET FRAGMENT -->
<wicket:fragment wicket:id="vetoedFragment">
<div class="alert alert-error submit-info" style="padding:4px;">
@@ -596,7 +597,7 @@
quality="high"
wmode="transparent"
scale="noscale"
- allowScriptAccess="always"></object>
+ allowScriptAccess="sameDomain"></object>
</wicket:fragment>
</wicket:extend>
--
Gitblit v1.9.1