Merge branch 'master' into css_bootstrap3

Conflicts:
	src/main/twirl/gitbucket/core/account/edit.scala.html

README.md

@@ -95,6 +95,11 @@ Support
 
 Release Notes
 --------
+### 3.9 - 5 Dec 2015
+- GFM inline breaks support in Markdown
+- WebHook on create review comment is available
+- WebHook event trigger is selectable
+
 ### 3.8 - 31 Oct 2015
 - Moved to GitHub organization
 - Omit diff view for large differences

project/build.scala

@@ -10,7 +10,7 @@ import sbtassembly.AssemblyKeys._
 object MyBuild extends Build {
   val Organization = "gitbucket"
   val Name = "gitbucket"
-  val Version = "3.8.0"
+  val Version = "3.9.0"
   val ScalaVersion = "2.11.6"
   val ScalatraVersion = "2.3.1"
 

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

@@ -11,7 +11,7 @@
     <div class="col-md-9">
       <div class="box">
         <div class="box-header">SSH Keys</div>
-        <div class="box-content">
+        <div class="box-content-bottom">
           @if(sshKeys.isEmpty){
             No keys
           }
@@ -27,7 +27,7 @@
       <form method="POST" action="@path/@account.userName/_ssh" validate="true">
         <div class="box">
           <div class="box-header">Add an SSH Key</div>
-          <div class="box-content">
+          <div class="box-content-bottom">
             <fieldset>
               <label for="title" class="strong">Title</label>
               <div><span id="error-title" class="error"></span></div>

src/main/twirl/gitbucket/core/admin/plugins/plugins.scala.html

@@ -15,7 +15,7 @@
             @plugins.map {plugin =>
                 <div class="box">
                     <div class="box-header">@plugin.pluginName</div>
-                    <div class="box-content">
+                    <div class="box-content-bottom">
                         <p><span class="strong">Id:&nbsp;</span>@plugin.pluginId</p>
                         <p><span class="strong">Version:&nbsp;</span>@plugin.version</p>
                         <p><span class="strong">Name:&nbsp;</span>@plugin.pluginName</p>