From 26cc4ed9fad9796756d34ae0fd3350bd3c139c7a Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 17 Apr 2014 23:07:56 -0400 Subject: [PATCH] [findbugs] Fix incorrect key lookup in commit cache --- src/main/java/com/gitblit/wicket/pages/TicketPage.html | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.html b/src/main/java/com/gitblit/wicket/pages/TicketPage.html index 6fcf96c..aa52d8f 100644 --- a/src/main/java/com/gitblit/wicket/pages/TicketPage.html +++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.html @@ -298,11 +298,28 @@ </wicket:fragment> +<!-- CAN NOT PROPOSE FRAGMENT --> +<wicket:fragment wicket:id="canNotProposeFragment"> + <div class="featureWelcome"> + <div class="row"> + <div class="icon span2 hidden-phone"><i class="fa fa-ban"></i></div> + <div class="span9"> + <h1><wicket:message key="gb.canNotProposePatchset"></wicket:message></h1> + <div class="markdown"> + <p><span wicket:id="reason"></span></p> + </div> + </div> + </div> + </div> +</wicket:fragment> + + <!-- PATCHSET FRAGMENT --> <wicket:fragment wicket:id="patchsetFragment"> - <div class="row" style="padding: 0px 0px 20px;"> + <div class="row" style="padding: 0px;"> <div class="span12 attribution-border"> - <div wicket:id="panel"></div> + <div wicket:id="mergePanel" style="margin-bottom: 10px;"></div> + <div wicket:id="panel"></div> </div> </div> @@ -335,9 +352,8 @@ <!-- COLLAPSIBLE PATCHSET (temp) --> <wicket:fragment wicket:id="collapsiblePatchsetFragment"> -<div wicket:id="mergePanel" style="margin-bottom: 10px;"></div> <div class="accordion" id="accordionPatchset" style="clear:both;margin: 0px;"> -<div class="patch-group"> +<div class="patch-group" style="margin-bottom: 20px;"> <div class="accordion-heading"> <div class="attribution-patch-pullright"> <div style="padding-bottom: 2px;"> -- Gitblit v1.9.1