Merge branch 'master' of https://github.com/gitblit/gitblit

mrbytes

2014-03-08 6be15a1cac2f98585174f501879c3685ef2a54b6

 src/main/java/com/gitblit/wicket/pages/NewTicketPage.html

@@ -41,6 +41,7 @@
         <tr><th><wicket:message key="gb.type"></wicket:message><span style="color:red;">*</span></th><td class="edit"><select class="input-large" wicket:id="type"></select></td></tr>

         <tr wicket:id="responsible"></tr>

         <tr wicket:id="milestone"></tr>

         <tr wicket:id="mergeto"></tr>

      </table>

   </div>

   </div>   

@@ -62,5 +63,9 @@
   <th><wicket:message key="gb.milestone"></wicket:message></th><td class="edit"><select class="input-large" wicket:id="milestone"></select></td>

</wicket:fragment>



<wicket:fragment wicket:id="mergeToFragment">

   <th><wicket:message key="gb.mergeTo"></wicket:message></th><td class="edit"><select class="input-large" wicket:id="mergeto"></select></td>

</wicket:fragment>



</wicket:extend>

</html>