Merge remote-tracking branch 'origin/master'

src/main/scala/app/IssuesController.scala

@@ -115,6 +115,16 @@ trait IssuesControllerBase extends ControllerBase {
     redirect("/%s/%s/issues/_data/%d".format(owner, repository, issueId))
   }
 
+  // TODO Authenticator
+  ajaxPost("/:owner/:repository/issues/:id/label/:labelId/new"){
+    "TODO Insert!"
+  }
+
+  // TODO Authenticator
+  ajaxPost("/:owner/:repository/issues/:id/label/:labelId/delete"){
+    "TODO Delete!"
+  }
+
   // TODO requires users only and readable repository checking
   post("/:owner/:repository/issue_comments/new", commentForm)( usersOnly { form =>
     val owner = params("owner")

src/main/scala/service/IssuesService.scala

@@ -179,9 +179,12 @@ trait IssuesService {
         .update (id) > 0
     } get
 
-  def registerIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int): Unit =
+  def registerIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int) =
     IssueLabels insert (IssueLabel(owner, repository, issueId, labelId))
 
+  def deleteIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int) =
+    IssueLabels filter(_.byPrimaryKey(owner, repository, issueId, labelId)) delete
+
   def createComment(owner: String, repository: String, loginUser: String,
       issueId: Int, content: String, action: Option[String]) =
     IssueComments.autoInc insert (