Merge branch 'master'

Conflicts:
	project/build.scala

src/main/scala/gitbucket/core/api/ApiLabel.scala

@@ -0,0 +1,21 @@
+package gitbucket.core.api
+
+import gitbucket.core.model.Label
+import gitbucket.core.util.RepositoryName
+
+/**
+  * https://developer.github.com/v3/issues/labels/
+  */
+case class ApiLabel(
+  name: String,
+  color: String)(repositoryName: RepositoryName){
+  var url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/labels/${name}")
+}
+
+object ApiLabel{
+  def apply(label:Label, repositoryName: RepositoryName): ApiLabel =
+    ApiLabel(
+      name = label.labelName,
+      color = label.color
+    )(repositoryName)
+}

src/main/scala/gitbucket/core/api/CreateALabel.scala

@@ -0,0 +1,18 @@
+package gitbucket.core.api
+
+/**
+  * https://developer.github.com/v3/issues/labels/#create-a-label
+  * api form
+  */
+case class CreateALabel(
+    name: String,
+    color: String
+) {
+  def isValid: Boolean = {
+    name.length<=100 &&
+      !name.startsWith("_") &&
+      !name.startsWith("-") &&
+      color.length==6 &&
+      color.matches("[a-fA-F0-9+_.]+")
+  }
+}

src/main/scala/gitbucket/core/api/JsonFormat.scala

@@ -31,6 +31,7 @@ object JsonFormat {
     FieldSerializer[ApiPullRequest.Commit]() +
     FieldSerializer[ApiIssue]() +
     FieldSerializer[ApiComment]() +
+    FieldSerializer[ApiLabel]() +
     ApiBranchProtection.enforcementLevelSerializer
 
   def apiPathSerializer(c: Context) = new CustomSerializer[ApiPath](format =>

src/main/scala/gitbucket/core/controller/LabelsController.scala

@@ -1,12 +1,13 @@
 package gitbucket.core.controller
 
+import gitbucket.core.api.{ApiError, CreateALabel, ApiLabel, JsonFormat}
 import gitbucket.core.issues.labels.html
 import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, LabelsService}
-import gitbucket.core.util.{ReferrerAuthenticator, CollaboratorsAuthenticator}
+import gitbucket.core.util.{LockUtil, RepositoryName, ReferrerAuthenticator, CollaboratorsAuthenticator}
 import gitbucket.core.util.Implicits._
 import io.github.gitbucket.scalatra.forms._
 import org.scalatra.i18n.Messages
-import org.scalatra.Ok
+import org.scalatra.{NoContent, UnprocessableEntity, Created, Ok}
 
 class LabelsController extends LabelsControllerBase
   with LabelsService with IssuesService with RepositoryService with AccountService
@@ -19,7 +20,7 @@ trait LabelsControllerBase extends ControllerBase {
   case class LabelForm(labelName: String, color: String)
 
   val labelForm = mapping(
-    "labelName"  -> trim(label("Label name", text(required, labelName, maxlength(100)))),
+    "labelName"  -> trim(label("Label name", text(required, labelName, uniqueLabelName, maxlength(100)))),
     "labelColor" -> trim(label("Color",      text(required, color)))
   )(LabelForm.apply)
 
@@ -31,6 +32,26 @@ trait LabelsControllerBase extends ControllerBase {
       hasWritePermission(repository.owner, repository.name, context.loginAccount))
   })
 
+  /**
+    * List all labels for this repository
+    * https://developer.github.com/v3/issues/labels/#list-all-labels-for-this-repository
+    */
+  get("/api/v3/repos/:owner/:repository/labels")(referrersOnly { repository =>
+    JsonFormat(getLabels(repository.owner, repository.name).map { label =>
+      ApiLabel(label, RepositoryName(repository))
+    })
+  })
+
+  /**
+    * Get a single label
+    * https://developer.github.com/v3/issues/labels/#get-a-single-label
+    */
+  get("/api/v3/repos/:owner/:repository/labels/:labelName")(referrersOnly { repository =>
+    getLabel(repository.owner, repository.name, params("labelName")).map { label =>
+      JsonFormat(ApiLabel(label, RepositoryName(repository)))
+    } getOrElse NotFound()
+  })
+
   ajaxGet("/:owner/:repository/issues/labels/new")(collaboratorsOnly { repository =>
     html.edit(None, repository)
   })
@@ -45,6 +66,31 @@ trait LabelsControllerBase extends ControllerBase {
       hasWritePermission(repository.owner, repository.name, context.loginAccount))
   })
 
+  /**
+    * Create a label
+    * https://developer.github.com/v3/issues/labels/#create-a-label
+    */
+  post("/api/v3/repos/:owner/:repository/labels")(collaboratorsOnly { repository =>
+    (for{
+      data <- extractFromJsonBody[CreateALabel] if data.isValid
+    } yield {
+      LockUtil.lock(RepositoryName(repository).fullName) {
+        if (getLabel(repository.owner, repository.name, data.name).isEmpty) {
+          val labelId = createLabel(repository.owner, repository.name, data.name, data.color)
+          getLabel(repository.owner, repository.name, labelId).map { label =>
+            Created(JsonFormat(ApiLabel(label, RepositoryName(repository))))
+          } getOrElse NotFound()
+        } else {
+          // TODO ApiError should support errors field to enhance compatibility of GitHub API
+          UnprocessableEntity(ApiError(
+            "Validation Failed",
+            Some("https://developer.github.com/v3/issues/labels/#create-a-label")
+          ))
+        }
+      }
+    }) getOrElse NotFound()
+  })
+
   ajaxGet("/:owner/:repository/issues/labels/:labelId/edit")(collaboratorsOnly { repository =>
     getLabel(repository.owner, repository.name, params("labelId").toInt).map { label =>
       html.edit(Some(label), repository)
@@ -61,11 +107,50 @@ trait LabelsControllerBase extends ControllerBase {
       hasWritePermission(repository.owner, repository.name, context.loginAccount))
   })
 
+  /**
+    * Update a label
+    * https://developer.github.com/v3/issues/labels/#update-a-label
+    */
+  patch("/api/v3/repos/:owner/:repository/labels/:labelName")(collaboratorsOnly { repository =>
+    (for{
+      data <- extractFromJsonBody[CreateALabel] if data.isValid
+    } yield {
+      LockUtil.lock(RepositoryName(repository).fullName) {
+        getLabel(repository.owner, repository.name, params("labelName")).map { label =>
+          if (getLabel(repository.owner, repository.name, data.name).isEmpty) {
+            updateLabel(repository.owner, repository.name, label.labelId, data.name, data.color)
+            JsonFormat(ApiLabel(
+              getLabel(repository.owner, repository.name, label.labelId).get,
+              RepositoryName(repository)))
+          } else {
+            // TODO ApiError should support errors field to enhance compatibility of GitHub API
+            UnprocessableEntity(ApiError(
+              "Validation Failed",
+              Some("https://developer.github.com/v3/issues/labels/#create-a-label")))
+          }
+        } getOrElse NotFound()
+      }
+    }) getOrElse NotFound()
+  })
+
   ajaxPost("/:owner/:repository/issues/labels/:labelId/delete")(collaboratorsOnly { repository =>
     deleteLabel(repository.owner, repository.name, params("labelId").toInt)
     Ok()
   })
 
+  /**
+    * Delete a label
+    * https://developer.github.com/v3/issues/labels/#delete-a-label
+    */
+  delete("/api/v3/repos/:owner/:repository/labels/:labelName")(collaboratorsOnly { repository =>
+    LockUtil.lock(RepositoryName(repository).fullName) {
+      getLabel(repository.owner, repository.name, params("labelName")).map { label =>
+        deleteLabel(repository.owner, repository.name, label.labelId)
+        NoContent()
+      } getOrElse NotFound()
+    }
+  })
+
   /**
    * Constraint for the identifier such as user name, repository name or page name.
    */
@@ -80,4 +165,12 @@ trait LabelsControllerBase extends ControllerBase {
       }
   }
 
+  private def uniqueLabelName: Constraint = new Constraint(){
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] = {
+      val owner = params("owner")
+      val repository = params("repository")
+      getLabel(owner, repository, value).map(_ => "Name has already been taken.")
+    }
+  }
+
 }

src/main/scala/gitbucket/core/model/BasicTemplate.scala

@@ -26,12 +26,16 @@ protected[model] trait TemplateComponent { self: Profile =>
 
   trait LabelTemplate extends BasicTemplate { self: Table[_] =>
     val labelId = column[Int]("LABEL_ID")
+    val labelName = column[String]("LABEL_NAME")
 
     def byLabel(owner: String, repository: String, labelId: Int) =
       byRepository(owner, repository) && (this.labelId === labelId.bind)
 
     def byLabel(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) =
       byRepository(userName, repositoryName) && (this.labelId === labelId)
+
+    def byLabel(owner: String, repository: String, labelName: String) =
+      byRepository(userName, repositoryName) && (this.labelName === labelName.bind)
   }
 
   trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>

src/main/scala/gitbucket/core/model/Labels.scala

@@ -7,7 +7,7 @@ trait LabelComponent extends TemplateComponent { self: Profile =>
 
   class Labels(tag: Tag) extends Table[Label](tag, "LABEL") with LabelTemplate {
     override val labelId = column[Int]("LABEL_ID", O AutoInc)
-    val labelName = column[String]("LABEL_NAME")
+    override val labelName = column[String]("LABEL_NAME")
     val color = column[String]("COLOR")
     def * = (userName, repositoryName, labelId, labelName, color) <> (Label.tupled, Label.unapply)
 

src/main/scala/gitbucket/core/service/LabelsService.scala

@@ -12,6 +12,9 @@ trait LabelsService {
   def getLabel(owner: String, repository: String, labelId: Int)(implicit s: Session): Option[Label] =
     Labels.filter(_.byPrimaryKey(owner, repository, labelId)).firstOption
 
+  def getLabel(owner: String, repository: String, labelName: String)(implicit s: Session): Option[Label] =
+    Labels.filter(_.byLabel(owner, repository, labelName)).firstOption
+
   def createLabel(owner: String, repository: String, labelName: String, color: String)(implicit s: Session): Int =
     Labels returning Labels.map(_.labelId) += Label(
       userName       = owner,

src/main/scala/gitbucket/core/ssh/GitCommand.scala

@@ -23,10 +23,10 @@ object GitCommand {
 abstract class GitCommand() extends Command {
 
   private val logger = LoggerFactory.getLogger(classOf[GitCommand])
-  protected var err: OutputStream = null
-  protected var in: InputStream = null
-  protected var out: OutputStream = null
-  protected var callback: ExitCallback = null
+  @volatile protected var err: OutputStream = null
+  @volatile protected var in: InputStream = null
+  @volatile protected var out: OutputStream = null
+  @volatile protected var callback: ExitCallback = null
 
   protected def runTask(user: String)(implicit session: Session): Unit
 

src/main/scala/gitbucket/core/view/Markdown.scala

@@ -68,7 +68,7 @@ object Markdown {
 
       if(enableAnchor){
         out.append(" class=\"markdown-head\">")
-        out.append("<a class=\"markdown-anchor-link\" href=\"#" + id + "\"></a>")
+        out.append("<a class=\"markdown-anchor-link\" href=\"#" + id + "\"><span class=\"octicon octicon-link\"></span></a>")
         out.append("<a class=\"markdown-anchor\" name=\"" + id + "\"></a>")
       } else {
         out.append(">")

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

@@ -75,8 +75,7 @@
             <div class="pull-right" style="margin-top: 6px;">
               <div class="btn-group" style="margin-right: 8px;">
                 <a class="dropdown-toggle menu" data-toggle="dropdown" href="#">
-                  <i class="octicon octicon-plus" style="color: black; font-size: 20px; vertical-align: middle;height:20px !important;"></i>
-                  <span class="caret" style="color: black; vertical-align: middle;"></span>
+                  <i class="octicon octicon-plus" style="color: black; font-size: 20px; vertical-align: middle;height:20px !important;"></i><span class="caret" style="color: black; vertical-align: middle;"></span>
                 </a>
                 <ul class="dropdown-menu pull-right">
                   <li><a href="@path/new">New repository</a></li>
@@ -84,8 +83,8 @@
                 </ul>
               </div>
               <div class="btn-group">
-                <a class="dropdown-toggle menu" data-toggle="dropdown" href="#" data-toggle="tooltip" data-placement="bottom" title="Signed is as @loginAccount.get.userName">@avatar(loginAccount.get.userName, 16)
-                  <span class="caret" style="color: black; vertical-align: middle;"></span>
+                <a class="dropdown-toggle menu" data-toggle="dropdown" href="#" data-toggle="tooltip" data-placement="bottom" title="Signed is as @loginAccount.get.userName">
+                  @avatar(loginAccount.get.userName, 16)<span class="caret" style="color: black; vertical-align: middle;"></span>
                 </a>
                 <ul class="dropdown-menu pull-right">
                   <li><a href="@url(loginAccount.get.userName)">Your profile</a></li>

src/main/webapp/assets/common/css/gitbucket.css

@@ -1446,6 +1446,10 @@ div.wiki-sidebar {
   margin-top: 20px;
 }
 
+div.wiki-sidebar img {
+  max-width: 100%;
+}
+
 div.wiki-sidebar-dotted {
   background-color: white;
   border: 1px dashed #ddd;
@@ -1878,6 +1882,10 @@ div.markdown-body p {
   line-height: 1.5;
 }
 
+div.markdown-body img {
+  max-width: 100%;
+}
+
 div.markdown-body pre {
   font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
   font-size: 12px;
@@ -2035,39 +2043,16 @@ div.markdown-body table colgroup + tbody tr:first-child td:last-child {
 }
 
 a.markdown-anchor-link {
-  position: absolute;
-  left: -18px;
-  display: none;
+  margin-left: -16px;
+  margin-right: 2px;
+  line-height: 1;
   color: #999;
-  /* From octicon style */
-  font: normal normal normal 16px/1 octicons;
-  text-decoration: none;
-  text-rendering: auto;
-}
-a.markdown-anchor-link:before { content: '\f05c'} /*  */
-
-h1 a.markdown-anchor-link {
-  top: 24px;
+  cursor: pointer;
 }
 
-h2 a.markdown-anchor-link {
-  top: 20px;
-}
-
-h3 a.markdown-anchor-link {
-  top: 12px;
-}
-
-h4 a.markdown-anchor-link {
-  top: 8px;
-}
-
-h5 a.markdown-anchor-link {
-  top: 6px;
-}
-
-h6 a.markdown-anchor-link {
-  top: 6px;
+a.markdown-anchor-link span.octicon {
+  visibility: hidden;
+  vertical-align: middle;
 }
 
 /****************************************************************************/

src/main/webapp/assets/common/js/gitbucket.js

@@ -19,14 +19,11 @@ $(function(){
   });
 
   // anchor icon for markdown
-  $('.markdown-head').mouseenter(function(e){
-    $(e.target).children('a.markdown-anchor-link').show();
+  $('.markdown-head').on('mouseenter', function(e){
+    $(this).find('span.octicon').css('visibility', 'visible');
   });
-  $('.markdown-head').mouseleave(function(e){
-    $(e.target).children('a.markdown-anchor-link').hide();
-  });
-  $('a.markdown-anchor-link').mouseleave(function(e){
-    $(e.target).hide();
+  $('.markdown-head').on('mouseleave', function(e){
+    $(this).find('span.octicon').css('visibility', 'hidden');
   });
 
   // syntax highlighting by google-code-prettify

src/test/scala/gitbucket/core/api/JsonFormatSpec.scala

@@ -209,6 +209,15 @@ class JsonFormatSpec extends Specification {
     "url": "${context.baseUrl}/api/v3/repos/octocat/Hello-World/commits/$sha1/status"
   }"""
 
+  val apiLabel = ApiLabel(
+    name = "bug",
+    color = "f29513")(RepositoryName("octocat","Hello-World"))
+  val apiLabelJson = s"""{
+    "name": "bug",
+    "color": "f29513",
+    "url": "${context.baseUrl}/api/v3/repos/octocat/Hello-World/labels/bug"
+  }"""
+
   val apiIssue = ApiIssue(
       number = 1347,
       title  = "Found a bug",
@@ -411,6 +420,9 @@ class JsonFormatSpec extends Specification {
     "apiCombinedCommitStatus" in {
       JsonFormat(apiCombinedCommitStatus) must beFormatted(apiCombinedCommitStatusJson)
     }
+    "apiLabel" in {
+      JsonFormat(apiLabel) must beFormatted(apiLabelJson)
+    }
     "apiIssue" in {
       JsonFormat(apiIssue) must beFormatted(apiIssueJson)
       JsonFormat(apiIssuePR) must beFormatted(apiIssuePRJson)

src/test/scala/gitbucket/core/service/LabelsServiceSpec.scala

@@ -0,0 +1,114 @@
+package gitbucket.core.service
+
+import gitbucket.core.model._
+
+import org.specs2.mutable.Specification
+
+class LabelsServiceSpec extends Specification with ServiceSpecBase {
+  "getLabels" should {
+    "be empty when not have any labels" in { withTestDB { implicit session =>
+      generateNewUserWithDBRepository("user1", "repo1")
+
+      generateNewUserWithDBRepository("user1", "repo2")
+      dummyService.createLabel("user1", "repo2", "label1", "000000")
+
+      generateNewUserWithDBRepository("user2", "repo1")
+      dummyService.createLabel("user2", "repo1", "label1", "000000")
+
+      dummyService.getLabels("user1", "repo1") must haveSize(0)
+    }}
+    "return contained labels" in { withTestDB { implicit session =>
+      generateNewUserWithDBRepository("user1", "repo1")
+      val labelId1 = dummyService.createLabel("user1", "repo1", "label1", "000000")
+      val labelId2 = dummyService.createLabel("user1", "repo1", "label2", "ffffff")
+
+      generateNewUserWithDBRepository("user1", "repo2")
+      dummyService.createLabel("user1", "repo2", "label1", "000000")
+
+      generateNewUserWithDBRepository("user2", "repo1")
+      dummyService.createLabel("user2", "repo1", "label1", "000000")
+
+      def getLabels = dummyService.getLabels("user1", "repo1")
+
+      getLabels must haveSize(2)
+      getLabels must_== List(
+        Label("user1", "repo1", labelId1, "label1", "000000"),
+        Label("user1", "repo1", labelId2, "label2", "ffffff"))
+    }}
+  }
+  "getLabel" should {
+    "return None when the label not exist" in { withTestDB { implicit session =>
+      generateNewUserWithDBRepository("user1", "repo1")
+
+      dummyService.getLabel("user1", "repo1", 1) must beNone
+      dummyService.getLabel("user1", "repo1", "label1") must beNone
+    }}
+    "return a label fetched by label id" in { withTestDB { implicit session =>
+      generateNewUserWithDBRepository("user1", "repo1")
+      val labelId1 = dummyService.createLabel("user1", "repo1", "label1", "000000")
+      dummyService.createLabel("user1", "repo1", "label2", "ffffff")
+
+      generateNewUserWithDBRepository("user1", "repo2")
+      dummyService.createLabel("user1", "repo2", "label1", "000000")
+
+      generateNewUserWithDBRepository("user2", "repo1")
+      dummyService.createLabel("user2", "repo1", "label1", "000000")
+
+      def getLabel = dummyService.getLabel("user1", "repo1", labelId1)
+      getLabel must_== Some(Label("user1", "repo1", labelId1, "label1", "000000"))
+    }}
+    "return a label fetched by label name" in { withTestDB { implicit session =>
+      generateNewUserWithDBRepository("user1", "repo1")
+      val labelId1 = dummyService.createLabel("user1", "repo1", "label1", "000000")
+      dummyService.createLabel("user1", "repo1", "label2", "ffffff")
+
+      generateNewUserWithDBRepository("user1", "repo2")
+      dummyService.createLabel("user1", "repo2", "label1", "000000")
+
+      generateNewUserWithDBRepository("user2", "repo1")
+      dummyService.createLabel("user2", "repo1", "label1", "000000")
+
+      def getLabel = dummyService.getLabel("user1", "repo1", "label1")
+      getLabel must_== Some(Label("user1", "repo1", labelId1, "label1", "000000"))
+    }}
+  }
+  "createLabel" should {
+    "return accurate label id" in { withTestDB { implicit session =>
+      generateNewUserWithDBRepository("user1", "repo1")
+      generateNewUserWithDBRepository("user1", "repo2")
+      generateNewUserWithDBRepository("user2", "repo1")
+      dummyService.createLabel("user1", "repo1", "label1", "000000")
+      dummyService.createLabel("user1", "repo2", "label1", "000000")
+      dummyService.createLabel("user2", "repo1", "label1", "000000")
+      val labelId = dummyService.createLabel("user1", "repo1", "label2", "000000")
+      labelId must_== 4
+      def getLabel = dummyService.getLabel("user1", "repo1", labelId)
+      getLabel must_== Some(Label("user1", "repo1", labelId, "label2", "000000"))
+    }}
+  }
+  "updateLabel" should {
+    "change target label" in { withTestDB { implicit session =>
+      generateNewUserWithDBRepository("user1", "repo1")
+      generateNewUserWithDBRepository("user1", "repo2")
+      generateNewUserWithDBRepository("user2", "repo1")
+      val labelId = dummyService.createLabel("user1", "repo1", "label1", "000000")
+      dummyService.createLabel("user1", "repo2", "label1", "000000")
+      dummyService.createLabel("user2", "repo1", "label1", "000000")
+      dummyService.updateLabel("user1", "repo1", labelId, "updated-label", "ffffff")
+      def getLabel = dummyService.getLabel("user1", "repo1", labelId)
+      getLabel must_== Some(Label("user1", "repo1", labelId, "updated-label", "ffffff"))
+    }}
+  }
+  "deleteLabel" should {
+    "remove target label" in { withTestDB { implicit session =>
+      generateNewUserWithDBRepository("user1", "repo1")
+      generateNewUserWithDBRepository("user1", "repo2")
+      generateNewUserWithDBRepository("user2", "repo1")
+      val labelId = dummyService.createLabel("user1", "repo1", "label1", "000000")
+      dummyService.createLabel("user1", "repo2", "label1", "000000")
+      dummyService.createLabel("user2", "repo1", "label1", "000000")
+      dummyService.deleteLabel("user1", "repo1", labelId)
+      dummyService.getLabel("user1", "repo1", labelId) must beNone
+    }}
+  }
+}

src/test/scala/gitbucket/core/service/ServiceSpecBase.scala

@@ -45,7 +45,7 @@ trait ServiceSpecBase {
   def user(name:String)(implicit s:Session):Account = AccountService.getAccountByUserName(name).get
 
   lazy val dummyService = new RepositoryService with AccountService with IssuesService with PullRequestService
-    with CommitStatusService (){}
+    with CommitStatusService with LabelsService (){}
 
   def generateNewUserWithDBRepository(userName:String, repositoryName:String)(implicit s:Session):Account = {
     val ac = AccountService.getAccountByUserName(userName).getOrElse(generateNewAccount(userName))