Merge pull request #1036 from Nexis81/maintenance/3.10

Update web.xml

project/build.scala

@@ -9,7 +9,7 @@ import JettyPlugin.autoImport._
 object MyBuild extends Build {
   val Organization = "gitbucket"
   val Name = "gitbucket"
-  val Version = "3.10.0"
+  val Version = "3.10.1"
   val ScalaVersion = "2.11.6"
   val ScalatraVersion = "2.3.1"
 

src/main/resources/logback.xml

@@ -6,12 +6,14 @@
     </encoder>
   </appender>
 
+  <!--
   <appender name="FILE" class="ch.qos.logback.core.FileAppender">
     <file>gitbucket.log</file>
     <encoder>
       <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
     </encoder>
   </appender>
+  -->
 
   <root level="INFO">
     <appender-ref ref="STDOUT" />

src/main/twirl/gitbucket/core/account/newrepo.scala.html

@@ -21,7 +21,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
             <ul class="dropdown-menu">
               <li><a href="javascript:void(0);" data-name="@loginAccount.get.userName"><i class="octicon octicon-check"></i> <span>@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</span></a></li>
               @groupNames.map { groupName =>
-                <li><a href="javascript:void(0);" data-name="@groupName"><i class="icon-white"></i> <span>@avatar(groupName, 20) @groupName</span></a></li>
+                <li><a href="javascript:void(0);" data-name="@groupName"><i class="octicon"></i> <span>@avatar(groupName, 20) @groupName</span></a></li>
               }
             </ul>
             <input type="hidden" name="owner" id="owner" value="@loginAccount.get.userName"/>
@@ -77,8 +77,8 @@ $('#owner-dropdown a').click(function(){
   var userName = $(this).data('name');
   $('#owner').val(userName);
 
-  $('#owner-dropdown i').attr('class', 'icon-white');
+  $('#owner-dropdown i').attr('class', 'octicon');
-  $(this).find('i').attr('class', 'icon-ok');
+  $(this).find('i').attr('class', 'octicon octicon-check');
 
   $('#owner-dropdown span.strong').html($(this).find('span').html());
 });

src/main/twirl/gitbucket/core/helper/checkicon.scala.html

@@ -2,5 +2,5 @@
 @if(condition){
   <i class="octicon octicon-check"></i>
 } else {
-  <i class="icon-white"></i>
+  <i class="octicon"></i>
 }

src/main/twirl/gitbucket/core/issues/issueinfo.scala.html

@@ -93,7 +93,7 @@
         @collaborators.map { collaborator =>
           <li>
             <a href="javascript:void(0);" class="assign" data-name="@collaborator">
-              @helper.html.checkicon(issue.exists(_.assignedUserName == collaborator))@avatar(collaborator, 20) @collaborator
+              @helper.html.checkicon(issue.exists(_.assignedUserName.exists(_ == collaborator)))@avatar(collaborator, 20) @collaborator
             </a>
           </li>
         }
@@ -164,7 +164,7 @@ $(function(){
     switchLabel($(this));
     var labelNames = Array();
     $('a.toggle-label').each(function(i, e){
-      if($(e).children('i').hasClass('icon-ok') == true){
+      if($(e).children('i').hasClass('octicon-check') == true){
         labelNames.push($(e).text().trim());
       }
     });
@@ -195,17 +195,17 @@ $(function(){
 
   function switchLabel($this){
     var i = $this.children('i');
-    if(i.hasClass('icon-ok')){
+    if(i.hasClass('octicon-check')){
-      i.removeClass().addClass('icon-white');
+      i.removeClass('octicon-check');
       return 'delete';
     } else {
-      i.removeClass().addClass('icon-ok');
+      i.addClass('octicon-check');
       return 'new';
     }
   }
 
   function displayMilestone(title, milestoneId, progress){
-    $('a.milestone i.icon-ok').attr('class', 'icon-white');
+    $('a.milestone i.octicon-check').removeClass('octicon-check');
     if(milestoneId == ''){
       $('#label-milestone').html($('<span class="muted small">').text('No milestone'));
       $('#milestone-progress-area').empty();
@@ -214,19 +214,19 @@ $(function(){
       if(progress){
         $('#milestone-progress-area').html(progress);
       }
-      $('a.milestone[data-id=' + milestoneId + '] i').attr('class', 'icon-ok');
+      $('a.milestone[data-id=' + milestoneId + '] i').addClass('octicon-check');
     }
   }
 
   function displayAssignee($this, userName){
-    $('a.assign i.icon-ok').attr('class', 'icon-white');
+    $('a.assign i.octicon-check').removeClass('octicon-check');
     if(userName == ''){
       $('#label-assigned').html($('<span class="muted small">').text('No one'));
     } else {
       $('#label-assigned').empty()
         .append($this.find('img.avatar-mini').clone(false)).append(' ')
         .append($('<a class="username strong small">').attr('href', '@context.path/' + userName).text(userName));
-      $('a.assign[data-name=' + jqSelectorEscape(userName) + '] i').attr('class', 'icon-ok');
+      $('a.assign[data-name=' + jqSelectorEscape(userName) + '] i').addClass('octicon-check');
     }
   }
 });

src/main/twirl/gitbucket/core/issues/listparts.scala.html

@@ -124,7 +124,7 @@
               @labels.map { label =>
                 <li>
                   <a href="javascript:void(0);" class="toggle-label" data-id="@label.labelId">
-                    <i class="icon-white"></i>
+                    <i class="octicon"></i>
                     <span class="label" style="background-color: #@label.color;">&nbsp;</span>
                     @label.labelName
                   </a>
@@ -140,7 +140,7 @@
             @helper.html.dropdown("Assignee", flat = true) {
               <li><a href="javascript:void(0);" class="toggle-assign" data-name=""><i class="octicon octicon-x"></i> Clear assignee</a></li>
               @collaborators.map { collaborator =>
-                <li><a href="javascript:void(0);" class="toggle-assign" data-name="@collaborator"><i class="icon-white"></i>@avatar(collaborator, 20) @collaborator</a></li>
+                <li><a href="javascript:void(0);" class="toggle-assign" data-name="@collaborator"><i class="octicon"></i>@avatar(collaborator, 20) @collaborator</a></li>
               }
             }
           </div>

src/main/twirl/gitbucket/core/pulls/compare.scala.html

@@ -174,8 +174,8 @@
 $(function(){
   $('a.origin-owner, a.forked-owner, a.origin-branch, a.forked-branch').click(function(){
     var e = $(this);
-    e.parents('ul').find('i').attr('class', 'icon-white');
+    e.parents('ul').find('i').attr('class', 'octicon');
-    e.find('i').attr('class', 'octicon-check');
+    e.find('i').addClass('octicon-check');
     e.parents('div.btn-group').find('button span.strong').text(e.text());
 
     @if(members.isEmpty){

src/main/webapp/WEB-INF/web.xml

@@ -4,6 +4,11 @@
       xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
       version="3.0">
 
+  <!-- ===================================================================== -->
+  <!-- Application Name -->
+  <!-- ===================================================================== -->
+  <display-name>GitBucket</display-name>
+
   <!-- ===================================================================== -->
   <!-- Session configuration -->
   <!-- ===================================================================== -->