Update version

Update README.md
(refs #1325 ) Prepend one more empty line when the first line is an empty line.
2026-05-07 22:16:25 +02:00 · 2016-10-29 15:00:20 +09:00 · 2016-10-29 15:00:01 +09:00 · 2016-10-26 12:21:21 +09:00 · 2016-10-26 10:44:20 +09:00 · 2016-10-19 01:29:00 +09:00
34 changed files with 456 additions and 282 deletions
--- a/README.md
+++ b/README.md
@@ -65,6 +65,13 @@ Support

 Release Notes
 -------------
+### 4.6 - 29 Oct 2016
+- Add disable option for forking
+- Add History button to wiki page
+- Git repository URL redirection for GitHub compatibility
+- Get-Content API improvement
+- Indicate who is group master in Members tab in group view
+
 ### 4.5 - 29 Sep 2016
 - Attach files by dropping into textarea
 - Issues / Pull requests switcher in dashboard
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.5.0"
+val GitBucketVersion = "4.6.0"
 val ScalatraVersion = "2.4.1"
 val JettyVersion = "9.3.9.v20160517"

@@ -50,7 +50,6 @@ libraryDependencies ++= Seq(
  "javax.servlet"             % "javax.servlet-api"            % "3.1.0"          % "provided",
  "junit"                     % "junit"                        % "4.12"           % "test",
  "org.scalatra"             %% "scalatra-scalatest"           % ScalatraVersion  % "test",
-  "org.scalaz"               %% "scalaz-core"                  % "7.2.4"          % "test",
  "com.wix"                   % "wix-embedded-mysql"           % "1.0.3"          % "test",
  "ru.yandex.qatools.embed"   % "postgresql-embedded"          % "1.14"           % "test"
 )
@@ -106,7 +105,6 @@ libraryDependencies ++= Seq(

 val executableKey = TaskKey[File]("executable")
 executableKey := {
-  import org.apache.ivy.util.ChecksumHelper
  import java.util.jar.{ Manifest => JarManifest }
  import java.util.jar.Attributes.{ Name => AttrName }

@@ -164,12 +162,6 @@ executableKey := {
  log info s"built executable webapp ${outputFile}"
  outputFile
 }
-/*
-Keys.artifact in (Compile, executableKey) ~= {
-    _ copy (`type` = "war", extension = "war"))
-}
-addArtifact(Keys.artifact in (Compile, executableKey), executableKey)
-*/
 publishTo <<= version { (v: String) =>
  val nexus = "https://oss.sonatype.org/"
  if (v.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots")
@@ -177,7 +169,6 @@ publishTo <<= version { (v: String) =>
 }
 publishMavenStyle := true
 pomIncludeRepository := { _ => false }
-artifact in Keys.`package` := Artifact(moduleName.value)
 pomExtra := (
  <url>https://github.com/gitbucket/gitbucket</url>
  <licenses>
--- a/src/main/resources/update/gitbucket-core_4.6.xml
+++ b/src/main/resources/update/gitbucket-core_4.6.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+    <addColumn tableName="REPOSITORY">
+        <column name="ALLOW_FORK" type="boolean" nullable="false" defaultValueBoolean="true"/>
+    </addColumn>
+</changeSet>
--- a/src/main/scala/ScalatraBootstrap.scala
+++ b/src/main/scala/ScalatraBootstrap.scala
@@ -1,12 +1,12 @@

-import gitbucket.core.controller._
-import gitbucket.core.plugin.PluginRegistry
-import gitbucket.core.servlet.{ApiAuthenticationFilter, Database, GitAuthenticationFilter, TransactionFilter}
-import gitbucket.core.util.Directory
 import java.util.EnumSet
 import javax.servlet._

+import gitbucket.core.controller._
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.SystemSettingsService
+import gitbucket.core.servlet._
+import gitbucket.core.util.Directory
 import org.scalatra._


@@ -25,6 +25,9 @@ class ScalatraBootstrap extends LifeCycle with SystemSettingsService {
    context.getFilterRegistration("gitAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
    context.addFilter("apiAuthenticationFilter", new ApiAuthenticationFilter)
    context.getFilterRegistration("apiAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/api/v3/*")
+    context.addFilter("ghCompatRepositoryAccessFilter", new GHCompatRepositoryAccessFilter)
+    context.getFilterRegistration("ghCompatRepositoryAccessFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
+
    // Register controllers
    context.mount(new AnonymousAccessController, "/*")

--- a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
+++ b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
@@ -15,5 +15,8 @@ object GitBucketCoreModule extends Module("gitbucket-core",
  new Version("4.2.1"),
  new Version("4.3.0"),
  new Version("4.4.0"),
-  new Version("4.5.0")
+  new Version("4.5.0"),
+  new Version("4.6.0",
+    new LiquibaseMigration("update/gitbucket-core_4.6.xml")
+  )
 )
--- a/src/main/scala/gitbucket/core/api/ApiContents.scala
+++ b/src/main/scala/gitbucket/core/api/ApiContents.scala
@@ -1,11 +1,18 @@
 package gitbucket.core.api

 import gitbucket.core.util.JGitUtil.FileInfo
+import org.apache.commons.codec.binary.Base64

-case class ApiContents(`type`: String, name: String)
+case class ApiContents(`type`: String, name: String, content: Option[String], encoding: Option[String])

 object ApiContents{
-  def apply(fileInfo: FileInfo): ApiContents =
-    if(fileInfo.isDirectory) ApiContents("dir", fileInfo.name)
-    else ApiContents("file", fileInfo.name)
-}
+  def apply(fileInfo: FileInfo, content: Option[Array[Byte]]): ApiContents = {
+    if(fileInfo.isDirectory) {
+      ApiContents("dir", fileInfo.name, None, None)
+    } else {
+      content.map(arr =>
+        ApiContents("file", fileInfo.name, Some(Base64.encodeBase64String(arr)), Some("base64"))
+      ).getOrElse(ApiContents("file", fileInfo.name, None, None))
+    }
+  }
+}
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -14,6 +14,7 @@ import gitbucket.core.util._
 import io.github.gitbucket.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.scalatra.i18n.Messages
+import org.scalatra.BadRequest


 class AccountController extends AccountControllerBase
@@ -120,7 +121,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
        // Members
        case "members" if(account.isGroupAccount) => {
          val members = getGroupMembers(account.userName)
-          gitbucket.core.account.html.members(account, members.map(_.userName),
+          gitbucket.core.account.html.members(account, members,
            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
        }

@@ -133,7 +134,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
        }
      }
-    } getOrElse NotFound
+    } getOrElse NotFound()
  }

  get("/:userName.atom") {
@@ -156,7 +157,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    val userName = params("userName")
    getAccountByUserName(userName).map { x =>
      html.edit(x, flash.get("info"), flash.get("error"))
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  post("/:userName/_edit", editForm)(oneselfOnly { form =>
@@ -172,7 +173,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
      flash += "info" -> "Account information has been updated."
      redirect(s"/${userName}/_edit")

-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  get("/:userName/_delete")(oneselfOnly {
@@ -196,14 +197,14 @@ trait AccountControllerBase extends AccountManagementControllerBase {
        session.invalidate
        redirect("/")
      }
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  get("/:userName/_ssh")(oneselfOnly {
    val userName = params("userName")
    getAccountByUserName(userName).map { x =>
      html.ssh(x, getPublicKeys(x.userName))
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  post("/:userName/_ssh", sshKeyForm)(oneselfOnly { form =>
@@ -234,7 +235,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
        case _ => None
      }
      html.application(x, tokens, generatedToken)
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  post("/:userName/_personalToken", personalTokenForm)(oneselfOnly { form =>
@@ -260,7 +261,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
      } else {
        html.register()
      }
-    } else NotFound
+    } else NotFound()
  }

  post("/register", newForm){ form =>
@@ -268,7 +269,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
      createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, false, form.url)
      updateImage(form.userName, form.fileId, false)
      redirect("/signin")
-    } else NotFound
+    } else NotFound()
  }

  get("/groups/new")(usersOnly {
@@ -329,7 +330,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
        updateImage(form.groupName, form.fileId, form.clearImage)
        redirect(s"/${form.groupName}")

-      } getOrElse NotFound
+      } getOrElse NotFound()
    }
  })

@@ -355,76 +356,80 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  })

  get("/:owner/:repository/fork")(readableUsersOnly { repository =>
-    val loginAccount   = context.loginAccount.get
-    val loginUserName  = loginAccount.userName
-    val groups         = getGroupsByUserName(loginUserName)
-    groups match {
-      case _: List[String] =>
-        val managerPermissions = groups.map { group =>
-          val members = getGroupMembers(group)
-          context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager })
-        }
-        helper.html.forkrepository(
-          repository,
-          (groups zip managerPermissions).toMap
-        )
-      case _ => redirect(s"/${loginUserName}")
-    }
+    if(repository.repository.options.allowFork){
+      val loginAccount   = context.loginAccount.get
+      val loginUserName  = loginAccount.userName
+      val groups         = getGroupsByUserName(loginUserName)
+      groups match {
+        case _: List[String] =>
+          val managerPermissions = groups.map { group =>
+            val members = getGroupMembers(group)
+            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager })
+          }
+          helper.html.forkrepository(
+            repository,
+            (groups zip managerPermissions).toMap
+          )
+        case _ => redirect(s"/${loginUserName}")
+      }
+    } else BadRequest()
  })

  post("/:owner/:repository/fork", accountForm)(readableUsersOnly { (form, repository) =>
-    val loginAccount  = context.loginAccount.get
-    val loginUserName = loginAccount.userName
-    val accountName   = form.accountName
+    if(repository.repository.options.allowFork){
+      val loginAccount  = context.loginAccount.get
+      val loginUserName = loginAccount.userName
+      val accountName   = form.accountName

-    LockUtil.lock(s"${accountName}/${repository.name}"){
-      if(getRepository(accountName, repository.name).isDefined ||
-          (accountName != loginUserName && !getGroupsByUserName(loginUserName).contains(accountName))){
-        // redirect to the repository if repository already exists
-        redirect(s"/${accountName}/${repository.name}")
-      } else {
-        // Insert to the database at first
-        val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
-        val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name)
+      LockUtil.lock(s"${accountName}/${repository.name}"){
+        if(getRepository(accountName, repository.name).isDefined ||
+            (accountName != loginUserName && !getGroupsByUserName(loginUserName).contains(accountName))){
+          // redirect to the repository if repository already exists
+          redirect(s"/${accountName}/${repository.name}")
+        } else {
+          // Insert to the database at first
+          val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
+          val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name)

-        insertRepository(
-          repositoryName       = repository.name,
-          userName             = accountName,
-          description          = repository.repository.description,
-          isPrivate            = repository.repository.isPrivate,
-          originRepositoryName = Some(originRepositoryName),
-          originUserName       = Some(originUserName),
-          parentRepositoryName = Some(repository.name),
-          parentUserName       = Some(repository.owner)
-        )
+          insertRepository(
+            repositoryName       = repository.name,
+            userName             = accountName,
+            description          = repository.repository.description,
+            isPrivate            = repository.repository.isPrivate,
+            originRepositoryName = Some(originRepositoryName),
+            originUserName       = Some(originUserName),
+            parentRepositoryName = Some(repository.name),
+            parentUserName       = Some(repository.owner)
+          )

-        // Add collaborators for group repository
-        val ownerAccount = getAccountByUserName(accountName).get
-        if(ownerAccount.isGroupAccount){
-          getGroupMembers(accountName).foreach { member =>
-            addCollaborator(accountName, repository.name, member.userName)
+          // Add collaborators for group repository
+          val ownerAccount = getAccountByUserName(accountName).get
+          if(ownerAccount.isGroupAccount){
+            getGroupMembers(accountName).foreach { member =>
+              addCollaborator(accountName, repository.name, member.userName)
+            }
          }
+
+          // Insert default labels
+          insertDefaultLabels(accountName, repository.name)
+
+          // clone repository actually
+          JGitUtil.cloneRepository(
+            getRepositoryDir(repository.owner, repository.name),
+            getRepositoryDir(accountName, repository.name))
+
+          // Create Wiki repository
+          JGitUtil.cloneRepository(
+            getWikiRepositoryDir(repository.owner, repository.name),
+            getWikiRepositoryDir(accountName, repository.name))
+
+          // Record activity
+          recordForkActivity(repository.owner, repository.name, loginUserName, accountName)
+          // redirect to the repository
+          redirect(s"/${accountName}/${repository.name}")
        }
-
-        // Insert default labels
-        insertDefaultLabels(accountName, repository.name)
-
-        // clone repository actually
-        JGitUtil.cloneRepository(
-          getRepositoryDir(repository.owner, repository.name),
-          getRepositoryDir(accountName, repository.name))
-
-        // Create Wiki repository
-        JGitUtil.cloneRepository(
-          getWikiRepositoryDir(repository.owner, repository.name),
-          getWikiRepositoryDir(accountName, repository.name))
-
-        // Record activity
-        recordForkActivity(repository.owner, repository.name, loginUserName, accountName)
-        // redirect to the repository
-        redirect(s"/${accountName}/${repository.name}")
      }
-    }
+    } else BadRequest()
  })

  private def existsAccount: Constraint = new Constraint(){
--- a/src/main/scala/gitbucket/core/controller/ApiController.scala
+++ b/src/main/scala/gitbucket/core/controller/ApiController.scala
@@ -7,9 +7,10 @@ import gitbucket.core.service.PullRequestService._
 import gitbucket.core.service._
 import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Directory._
-import gitbucket.core.util.JGitUtil.{CommitInfo, getFileList, getBranches, getDefaultBranch}
+import gitbucket.core.util.JGitUtil._
 import gitbucket.core.util._
 import gitbucket.core.util.Implicits._
+import gitbucket.core.view.helpers.{renderMarkup, isRenderable}
 import org.eclipse.jgit.api.Git
 import org.scalatra.{NoContent, UnprocessableEntity, Created}
 import scala.collection.JavaConverters._
@@ -66,7 +67,7 @@ trait ApiControllerBase extends ControllerBase {
  get("/api/v3/orgs/:groupName") {
    getAccountByUserName(params("groupName")).filter(account => account.isGroupAccount).map { account =>
      JsonFormat(ApiUser(account))
-    } getOrElse NotFound
+    } getOrElse NotFound()
  }

  /**
@@ -75,7 +76,7 @@ trait ApiControllerBase extends ControllerBase {
  get("/api/v3/users/:userName") {
    getAccountByUserName(params("userName")).filterNot(account => account.isGroupAccount).map { account =>
      JsonFormat(ApiUser(account))
-    } getOrElse NotFound
+    } getOrElse NotFound()
  }

  /**
@@ -109,13 +110,53 @@ trait ApiControllerBase extends ControllerBase {
   * https://developer.github.com/v3/repos/contents/#get-contents
   */
  get("/api/v3/repos/:owner/:repo/contents/*")(referrersOnly { repository =>
+    def getFileInfo(git: Git, revision: String, pathStr: String): Option[FileInfo] = {
+      val path = new java.io.File(pathStr)
+      val dirName = path.getParent match {
+        case null => "."
+        case s => s
+      }
+      getFileList(git, revision, dirName).find(f => f.name.equals(path.getName))
+    }
+
    val path = multiParams("splat").head match {
      case s if s.isEmpty => "."
      case s => s
    }
    val refStr = params.getOrElse("ref", repository.repository.defaultBranch)
+
    using(Git.open(getRepositoryDir(params("owner"), params("repo")))){ git =>
-      JsonFormat(getFileList(git, refStr, path).map{f => ApiContents(f)})
+      val fileList = getFileList(git, refStr, path)
+      if (fileList.isEmpty) { // file or NotFound
+        getFileInfo(git, refStr, path).flatMap(f => {
+          val largeFile = params.get("large_file").exists(s => s.equals("true"))
+          val content = getContentFromId(git, f.id, largeFile)
+          request.getHeader("Accept") match {
+            case "application/vnd.github.v3.raw" =>
+              content
+            case "application/vnd.github.v3.html" if isRenderable(f.name) =>
+              content.map(c =>
+                List(
+                  "<div data-path=\"", path, "\" id=\"file\">", "<article>",
+                  renderMarkup(path.split("/").toList, new String(c), refStr, repository, false, false, true).body,
+                  "</article>", "</div>"
+                ).mkString
+              )
+            case "application/vnd.github.v3.html" =>
+              content.map(c =>
+                List(
+                  "<div data-path=\"", path, "\" id=\"file\">", "<div class=\"plain\">", "<pre>",
+                  play.twirl.api.HtmlFormat.escape(new String(c)).body,
+                  "</pre>", "</div>", "</div>"
+                ).mkString
+              )
+            case _ =>
+              Some(JsonFormat(ApiContents(f, content)))
+          }
+        }).getOrElse(NotFound())
+      } else { // directory
+        JsonFormat(fileList.map{f => ApiContents(f, None)})
+      }
    }
  })

@@ -145,7 +186,7 @@ trait ApiControllerBase extends ControllerBase {
  get("/api/v3/user") {
    context.loginAccount.map { account =>
      JsonFormat(ApiUser(account))
-    } getOrElse Unauthorized
+    } getOrElse Unauthorized()
  }

  /**
@@ -179,7 +220,7 @@ trait ApiControllerBase extends ControllerBase {
          )
        }
      }
-    }) getOrElse NotFound
+    }) getOrElse NotFound()
  })

  /**
@@ -203,7 +244,7 @@ trait ApiControllerBase extends ControllerBase {
          )
        }
      }
-    }) getOrElse NotFound
+    }) getOrElse NotFound()
  })

  /**
@@ -221,7 +262,7 @@ trait ApiControllerBase extends ControllerBase {
        disableBranchProtection(repository.owner, repository.name, branch)
      }
      JsonFormat(ApiBranch(branch, protection)(RepositoryName(repository)))
-    }) getOrElse NotFound
+    }) getOrElse NotFound()
  })

  /**
@@ -243,7 +284,7 @@ trait ApiControllerBase extends ControllerBase {
      comments = getCommentsForApi(repository.owner, repository.name, issueId.toInt)
    } yield {
      JsonFormat(comments.map{ case (issueComment, user, issue) => ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(user), issue.isPullRequest) })
-    }).getOrElse(NotFound)
+    }) getOrElse NotFound()
  })

  /**
@@ -259,7 +300,7 @@ trait ApiControllerBase extends ControllerBase {
      issueComment <- getComment(repository.owner, repository.name, id.toString())
    } yield {
      JsonFormat(ApiComment(issueComment, RepositoryName(repository), issueId, ApiUser(context.loginAccount.get), issue.isPullRequest))
-    }) getOrElse NotFound
+    }) getOrElse NotFound()
  })

  /**
@@ -393,7 +434,7 @@ trait ApiControllerBase extends ControllerBase {
        ApiRepository(headRepo, ApiUser(headOwner)),
        ApiRepository(repository, ApiUser(baseOwner)),
        ApiUser(issueUser)))
-    }).getOrElse(NotFound)
+    }) getOrElse NotFound()
  })

  /**
@@ -412,7 +453,7 @@ trait ApiControllerBase extends ControllerBase {
          JsonFormat(commits)
        }
      }
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  /**
@@ -437,7 +478,7 @@ trait ApiControllerBase extends ControllerBase {
      status <- getCommitStatus(repository.owner, repository.name, statusId)
    } yield {
      JsonFormat(ApiCommitStatus(status, ApiUser(creator)))
-    }) getOrElse NotFound
+    }) getOrElse NotFound()
  })

  /**
@@ -453,7 +494,7 @@ trait ApiControllerBase extends ControllerBase {
      JsonFormat(getCommitStatuesWithCreator(repository.owner, repository.name, sha).map{ case(status, creator) =>
        ApiCommitStatus(status, ApiUser(creator))
      })
-    }) getOrElse NotFound
+    }) getOrElse NotFound()
  })

  /**
@@ -478,7 +519,7 @@ trait ApiControllerBase extends ControllerBase {
    } yield {
      val statuses = getCommitStatuesWithCreator(repository.owner, repository.name, sha)
      JsonFormat(ApiCombinedCommitStatus(sha, statuses, ApiRepository(repository, owner)))
-    }) getOrElse NotFound
+    }) getOrElse NotFound()
  })

  private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
--- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala
@@ -248,7 +248,7 @@ trait AccountManagementControllerBase extends ControllerBase {
  protected def reservedNames(): Constraint = new Constraint(){
    override def validate(name: String, value: String, messages: Messages): Option[String] = if(allReservedNames.contains(value)){
      Some(s"${value} is reserved")
-    }else{
+    } else {
      None
    }
  }
--- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala
+++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala
@@ -48,7 +48,7 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
      // Check whether logged-in user is collaborator
      collaboratorsOnly(owner, repository, loginAccount){
        execute({ (file, fileId) =>
-          val fileName   = file.getName
+          val fileName = file.getName
          LockUtil.lock(s"${owner}/${repository}/wiki") {
            using(Git.open(Directory.getWikiRepositoryDir(owner, repository))) { git =>
              val builder  = DirCache.newInCore.builder()
@@ -75,7 +75,7 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
          }
        }, FileUtil.isUploadableType)
      }
-    } getOrElse BadRequest
+    } getOrElse BadRequest()
  }

  post("/import") {
@@ -93,7 +93,7 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
    loginAccount match {
      case x if(x.isAdmin) => action
      case x if(getCollaborators(owner, repository).contains(x.userName)) => action
-      case _ => BadRequest
+      case _ => BadRequest()
    }
  }

@@ -101,10 +101,9 @@ class FileUploadController extends ScalatraServlet with FileUploadSupport with R
    case Some(file) if(mimeTypeChcker(file.name)) =>
      defining(FileUtil.generateFileId){ fileId =>
        f(file, fileId)
-
        Ok(fileId)
      }
-    case _ => BadRequest
+    case _ => BadRequest()
  }

 }
--- a/src/main/scala/gitbucket/core/controller/IssuesController.scala
+++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala
@@ -67,19 +67,19 @@ trait IssuesControllerBase extends ControllerBase {
          _,
          getComments(owner, name, issueId.toInt),
          getIssueLabels(owner, name, issueId.toInt),
-          (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted,
+          (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).exists(_.isGroupAccount)) Nil else List(owner))).sorted,
          getMilestonesWithIssueCount(owner, name),
          getLabels(owner, name),
          hasWritePermission(owner, name, context.loginAccount),
          repository)
-      } getOrElse NotFound
+      } getOrElse NotFound()
    }
  })

  get("/:owner/:repository/issues/new")(readableUsersOnly { repository =>
    defining(repository.owner, repository.name){ case (owner, name) =>
      html.create(
-        (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted,
+        (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).exists(_.isGroupAccount)) Nil else List(owner))).sorted,
          getMilestones(owner, name),
          getLabels(owner, name),
          hasWritePermission(owner, name, context.loginAccount),
@@ -139,8 +139,8 @@ trait IssuesControllerBase extends ControllerBase {
          createReferComment(owner, name, issue.copy(title = title), title, context.loginAccount.get)

          redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
-        } else Unauthorized
-      } getOrElse NotFound
+        } else Unauthorized()
+      } getOrElse NotFound()
    }
  })

@@ -154,8 +154,8 @@ trait IssuesControllerBase extends ControllerBase {
          createReferComment(owner, name, issue, content.getOrElse(""), context.loginAccount.get)

          redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
-        } else Unauthorized
-      } getOrElse NotFound
+        } else Unauthorized()
+      } getOrElse NotFound()
    }
  })

@@ -166,7 +166,7 @@ trait IssuesControllerBase extends ControllerBase {
        redirect(s"/${repository.owner}/${repository.name}/${
          if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
      }
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  post("/:owner/:repository/issue_comments/state", issueStateForm)(readableUsersOnly { (form, repository) =>
@@ -176,7 +176,7 @@ trait IssuesControllerBase extends ControllerBase {
        redirect(s"/${repository.owner}/${repository.name}/${
          if(issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}")
      }
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  ajaxPost("/:owner/:repository/issue_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
@@ -185,8 +185,8 @@ trait IssuesControllerBase extends ControllerBase {
        if(isEditable(owner, name, comment.commentedUserName)){
          updateComment(comment.commentId, form.content)
          redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
-        } else Unauthorized
-      } getOrElse NotFound
+        } else Unauthorized()
+      } getOrElse NotFound()
    }
  })

@@ -195,8 +195,8 @@ trait IssuesControllerBase extends ControllerBase {
      getComment(owner, name, params("id")).map { comment =>
        if(isEditable(owner, name, comment.commentedUserName)){
          Ok(deleteComment(comment.commentId))
-        } else Unauthorized
-      } getOrElse NotFound
+        } else Unauthorized()
+      } getOrElse NotFound()
    }
  })

@@ -223,8 +223,8 @@ trait IssuesControllerBase extends ControllerBase {
            )
          )
        }
-      } else Unauthorized
-    } getOrElse NotFound
+      } else Unauthorized()
+    } getOrElse NotFound()
  })

  ajaxGet("/:owner/:repository/issue_comments/_data/:id")(readableUsersOnly { repository =>
@@ -249,8 +249,8 @@ trait IssuesControllerBase extends ControllerBase {
            )
          )
        }
-      } else Unauthorized
-    } getOrElse NotFound
+      } else Unauthorized()
+    } getOrElse NotFound()
  })

  ajaxPost("/:owner/:repository/issues/new/label")(collaboratorsOnly { repository =>
@@ -284,7 +284,7 @@ trait IssuesControllerBase extends ControllerBase {
      getMilestonesWithIssueCount(repository.owner, repository.name)
          .find(_._1.milestoneId == milestoneId).map { case (_, openCount, closeCount) =>
        gitbucket.core.issues.milestones.html.progress(openCount + closeCount, closeCount)
-      } getOrElse NotFound
+      } getOrElse NotFound()
    } getOrElse Ok()
  })

@@ -313,7 +313,7 @@ trait IssuesControllerBase extends ControllerBase {
          registerIssueLabel(repository.owner, repository.name, issueId, labelId)
        }
      }
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  post("/:owner/:repository/issues/batchedit/assign")(collaboratorsOnly { repository =>
@@ -340,7 +340,7 @@ trait IssuesControllerBase extends ControllerBase {
          RawData(FileUtil.getMimeType(file.getName), file)
        }
      case _ => None
-    }) getOrElse NotFound
+    }) getOrElse NotFound()
  })

  val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
--- a/src/main/scala/gitbucket/core/controller/MilestonesController.scala
+++ b/src/main/scala/gitbucket/core/controller/MilestonesController.scala
@@ -42,7 +42,7 @@ trait MilestonesControllerBase extends ControllerBase {
  get("/:owner/:repository/issues/milestones/:milestoneId/edit")(collaboratorsOnly { repository =>
    params("milestoneId").toIntOpt.map{ milestoneId =>
      html.edit(getMilestone(repository.owner, repository.name, milestoneId), repository)
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(collaboratorsOnly { (form, repository) =>
@@ -51,7 +51,7 @@ trait MilestonesControllerBase extends ControllerBase {
        updateMilestone(milestone.copy(title = form.title, description = form.description, dueDate = form.dueDate))
        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
      }
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  get("/:owner/:repository/issues/milestones/:milestoneId/close")(collaboratorsOnly { repository =>
@@ -60,7 +60,7 @@ trait MilestonesControllerBase extends ControllerBase {
        closeMilestone(milestone)
        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
      }
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  get("/:owner/:repository/issues/milestones/:milestoneId/open")(collaboratorsOnly { repository =>
@@ -69,7 +69,7 @@ trait MilestonesControllerBase extends ControllerBase {
        openMilestone(milestone)
        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
      }
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  get("/:owner/:repository/issues/milestones/:milestoneId/delete")(collaboratorsOnly { repository =>
@@ -78,7 +78,7 @@ trait MilestonesControllerBase extends ControllerBase {
        deleteMilestone(repository.owner, repository.name, milestone.milestoneId)
        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
      }
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

 }
--- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
+++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
@@ -104,7 +104,7 @@ trait PullRequestsControllerBase extends ControllerBase {
            flash.toMap.map(f => f._1 -> f._2.toString))
        }
      }
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  ajaxGet("/:owner/:repository/pull/:id/mergeguide")(referrersOnly { repository =>
@@ -138,7 +138,7 @@ trait PullRequestsControllerBase extends ControllerBase {
          repository,
          getRepository(pullreq.requestUserName, pullreq.requestRepositoryName).get)
      }
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  get("/:owner/:repository/pull/:id/delete/*")(collaboratorsOnly { repository =>
@@ -153,7 +153,7 @@ trait PullRequestsControllerBase extends ControllerBase {
      }
      createComment(repository.owner, repository.name, userName, issueId, branchName, "delete_branch")
      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  post("/:owner/:repository/pull/:id/update_branch")(referrersOnly { baseRepository =>
@@ -222,7 +222,7 @@ trait PullRequestsControllerBase extends ControllerBase {
        }
        redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
      }
-    }) getOrElse NotFound
+    }) getOrElse NotFound()
  })

  post("/:owner/:repository/pull/:id/merge", mergeForm)(collaboratorsOnly { (form, repository) =>
@@ -273,7 +273,7 @@ trait PullRequestsControllerBase extends ControllerBase {
          }
        }
      }
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  get("/:owner/:repository/compare")(referrersOnly { forkedRepository =>
@@ -290,7 +290,7 @@ trait PullRequestsControllerBase extends ControllerBase {

            redirect(s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${originUserName}:${oldBranch}...${newBranch}")
          }
-        } getOrElse NotFound
+        } getOrElse NotFound()
      }
      case _ => {
        using(Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))){ git =>
@@ -386,7 +386,7 @@ trait PullRequestsControllerBase extends ControllerBase {
                     s"${forkedOwner}:${newId.map(_ => forkedId).getOrElse(forkedRepository.repository.defaultBranch)}")
        }
      }
-    }) getOrElse NotFound
+    }) getOrElse NotFound()
  })

  ajaxGet("/:owner/:repository/compare/*...*/mergecheck")(collaboratorsOnly { forkedRepository =>
@@ -416,7 +416,7 @@ trait PullRequestsControllerBase extends ControllerBase {
        }
        html.mergecheck(conflict)
      }
-    }) getOrElse NotFound
+    }) getOrElse NotFound()
  })

  post("/:owner/:repository/pulls/new", pullRequestForm)(referrersOnly { (form, repository) =>
--- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
@@ -35,7 +35,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    externalIssuesUrl: Option[String],
    enableWiki: Boolean,
    allowWikiEditing: Boolean,
-    externalWikiUrl: Option[String]
+    externalWikiUrl: Option[String],
+    allowFork: Boolean
  )
  
  val optionsForm = mapping(
@@ -46,7 +47,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    "externalIssuesUrl" -> trim(label("External Issues URL", optional(text(maxlength(200))))),
    "enableWiki"        -> trim(label("Enable Wiki"        , boolean())),
    "allowWikiEditing"  -> trim(label("Allow Wiki Editing" , boolean())),
-    "externalWikiUrl"   -> trim(label("External Wiki URL"  , optional(text(maxlength(200)))))
+    "externalWikiUrl"   -> trim(label("External Wiki URL"  , optional(text(maxlength(200))))),
+    "allowFork"         -> trim(label("Allow Forking"      , boolean()))
  )(OptionsForm.apply)

  // for default branch
@@ -111,7 +113,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
      form.externalIssuesUrl,
      form.enableWiki,
      form.allowWikiEditing,
-      form.externalWikiUrl
+      form.externalWikiUrl,
+      form.allowFork
    )
    // Change repository name
    if(repository.name != form.repositoryName){
@@ -297,7 +300,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
  get("/:owner/:repository/settings/hooks/edit")(ownerOnly { repository =>
    getWebHook(repository.owner, repository.name, params("url")).map{ case (webhook, events) =>
      html.edithooks(webhook, events, repository, flash.get("info"), false)
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  /**
--- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
@@ -152,7 +152,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            logs.splitWith{ (commit1, commit2) =>
              view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
            }, page, hasNext, hasWritePermission(repository.owner, repository.name, context.loginAccount))
-        case Left(_) => NotFound
+        case Left(_) => NotFound()
      }
    }
  })
@@ -177,7 +177,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        html.editor(branch, repository, paths.take(paths.size - 1).toList, Some(paths.last),
          JGitUtil.getContentInfo(git, path, objectId),
          protectedBranch)
-      } getOrElse NotFound
+      } getOrElse NotFound()
    }
  })

@@ -190,7 +190,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        val paths = path.split("/")
        html.delete(branch, repository, paths.take(paths.size - 1).toList, paths.last,
          JGitUtil.getContentInfo(git, path, objectId))
-      } getOrElse NotFound
+      } getOrElse NotFound()
    }
  })

@@ -250,7 +250,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          loader.copyTo(response.outputStream)
          ()
        }
-      } getOrElse NotFound
+      } getOrElse NotFound()
    }
  })

@@ -270,7 +270,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            response.setContentLength(loader.getSize.toInt)
            loader.copyTo(response.outputStream)
            ()
-          } getOrElse NotFound
+          } getOrElse NotFound()
        } else {
          html.blob(id, repository, path.split("/").toList,
            JGitUtil.getContentInfo(git, path, objectId),
@@ -278,7 +278,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            hasWritePermission(repository.owner, repository.name, context.loginAccount),
            request.paths(2) == "blame")
        }
-      } getOrElse NotFound
+      } getOrElse NotFound()
    }
  })

@@ -334,7 +334,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        }
      }
    } catch {
-      case e:MissingObjectException => NotFound
+      case e:MissingObjectException => NotFound()
    }
  })

@@ -397,8 +397,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
              )
            ))
        }
-      } else Unauthorized
-    } getOrElse NotFound
+      } else Unauthorized()
+    } getOrElse NotFound()
  })

  ajaxPost("/:owner/:repository/commit_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
@@ -407,8 +407,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        if(isEditable(owner, name, comment.commentedUserName)){
          updateCommitComment(comment.commentId, form.content)
          redirect(s"/${owner}/${name}/commit_comments/_data/${comment.commentId}")
-        } else Unauthorized
-      } getOrElse NotFound
+        } else Unauthorized()
+      } getOrElse NotFound()
    }
  })

@@ -417,8 +417,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      getCommitComment(owner, name, params("id")).map { comment =>
        if(isEditable(owner, name, comment.commentedUserName)){
          Ok(deleteCommitComment(comment.commentId))
-        } else Unauthorized
-      } getOrElse NotFound
+        } else Unauthorized()
+      } getOrElse NotFound()
    }
  })

@@ -489,23 +489,25 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        archiveRepository(name, ".zip", repository)
      case name if name.endsWith(".tar.gz") =>
        archiveRepository(name, ".tar.gz", repository)
-      case _ => BadRequest
+      case _ => BadRequest()
    }
  })

  get("/:owner/:repository/network/members")(referrersOnly { repository =>
-    html.forked(
-      getRepository(
-        repository.repository.originUserName.getOrElse(repository.owner),
-        repository.repository.originRepositoryName.getOrElse(repository.name)),
-      getForkedRepositories(
-        repository.repository.originUserName.getOrElse(repository.owner),
-        repository.repository.originRepositoryName.getOrElse(repository.name)),
-      context.loginAccount match {
-        case None => List()
-        case account: Option[Account] => getGroupsByUserName(account.get.userName)
-      }, // groups of current user
-      repository)
+    if(repository.repository.options.allowFork) {
+      html.forked(
+        getRepository(
+          repository.repository.originUserName.getOrElse(repository.owner),
+          repository.repository.originRepositoryName.getOrElse(repository.name)),
+        getForkedRepositories(
+          repository.repository.originUserName.getOrElse(repository.owner),
+          repository.repository.originRepositoryName.getOrElse(repository.name)),
+        context.loginAccount match {
+          case None => List()
+          case account: Option[Account] => getGroupsByUserName(account.get.userName)
+        }, // groups of current user
+        repository)
+    } else BadRequest()
  })

  /**
@@ -516,7 +518,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      val ref = multiParams("splat").head
      JGitUtil.getTreeId(git, ref).map{ treeId =>
        html.find(ref, treeId, repository)
-      } getOrElse NotFound
+      } getOrElse NotFound()
    }
  })

@@ -571,7 +573,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
              getPullRequestFromBranch(repository.owner, repository.name, revstr, repository.repository.defaultBranch),
              flash.get("info"), flash.get("error"))
          }
-        } getOrElse NotFound
+        } getOrElse NotFound()
      }
    }
  }
@@ -621,8 +623,11 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        updatePullRequests(repository.owner, repository.name, branch)

        // record activity
-        recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch,
-          List(new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))))
+        val commitInfo = new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+        recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch, List(commitInfo))
+
+        // create issue comment by commit message
+        createIssueComment(repository.owner, repository.name, commitInfo)

        // close issue by commit message
        closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
--- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
@@ -233,7 +233,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
        updateImage(userName, form.fileId, form.clearImage)
        redirect("/admin/users")
      }
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  get("/admin/users/_newgroup")(adminOnly {
@@ -291,7 +291,7 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
        updateImage(form.groupName, form.fileId, form.clearImage)
        redirect("/admin/users")

-      } getOrElse NotFound
+      } getOrElse NotFound()
    }
  })

--- a/src/main/scala/gitbucket/core/controller/WikiController.scala
+++ b/src/main/scala/gitbucket/core/controller/WikiController.scala
@@ -201,7 +201,7 @@ trait WikiControllerBase extends ControllerBase {

    getFileContent(repository.owner, repository.name, path).map { bytes =>
      RawData(FileUtil.getContentType(path, bytes), bytes)
-    } getOrElse NotFound
+    } getOrElse NotFound()
  })

  private def unique: Constraint = new Constraint(){
@@ -241,7 +241,7 @@ trait WikiControllerBase extends ControllerBase {
  private def targetWikiPage = getWikiPage(params("owner"), params("repository"), params("pageName"))

  private def isEditable(repository: RepositoryInfo)(implicit context: Context): Boolean =
-    repository.repository.allowWikiEditing || (
+    repository.repository.options.allowWikiEditing || (
      hasWritePermission(repository.owner, repository.name, context.loginAccount)
    )

--- a/src/main/scala/gitbucket/core/model/Repository.scala
+++ b/src/main/scala/gitbucket/core/model/Repository.scala
@@ -7,24 +7,62 @@ trait RepositoryComponent extends TemplateComponent { self: Profile =>
  lazy val Repositories = TableQuery[Repositories]

  class Repositories(tag: Tag) extends Table[Repository](tag, "REPOSITORY") with BasicTemplate {
-    val isPrivate = column[Boolean]("PRIVATE")
-    val description = column[String]("DESCRIPTION")
-    val defaultBranch = column[String]("DEFAULT_BRANCH")
-    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
-    val updatedDate = column[java.util.Date]("UPDATED_DATE")
-    val lastActivityDate = column[java.util.Date]("LAST_ACTIVITY_DATE")
-    val originUserName = column[String]("ORIGIN_USER_NAME")
+    val isPrivate            = column[Boolean]("PRIVATE")
+    val description          = column[String]("DESCRIPTION")
+    val defaultBranch        = column[String]("DEFAULT_BRANCH")
+    val registeredDate       = column[java.util.Date]("REGISTERED_DATE")
+    val updatedDate          = column[java.util.Date]("UPDATED_DATE")
+    val lastActivityDate     = column[java.util.Date]("LAST_ACTIVITY_DATE")
+    val originUserName       = column[String]("ORIGIN_USER_NAME")
    val originRepositoryName = column[String]("ORIGIN_REPOSITORY_NAME")
-    val parentUserName = column[String]("PARENT_USER_NAME")
+    val parentUserName       = column[String]("PARENT_USER_NAME")
    val parentRepositoryName = column[String]("PARENT_REPOSITORY_NAME")
-    val enableIssues = column[Boolean]("ENABLE_ISSUES")
-    val externalIssuesUrl = column[String]("EXTERNAL_ISSUES_URL")
-    val enableWiki = column[Boolean]("ENABLE_WIKI")
-    val allowWikiEditing = column[Boolean]("ALLOW_WIKI_EDITING")
-    val externalWikiUrl = column[String]("EXTERNAL_WIKI_URL")
-    def * = (userName, repositoryName, isPrivate, description.?, defaultBranch,
-      registeredDate, updatedDate, lastActivityDate, originUserName.?, originRepositoryName.?, parentUserName.?, parentRepositoryName.?,
-      enableIssues, externalIssuesUrl.?, enableWiki, allowWikiEditing, externalWikiUrl.?) <> (Repository.tupled, Repository.unapply)
+    val enableIssues         = column[Boolean]("ENABLE_ISSUES")
+    val externalIssuesUrl    = column[String]("EXTERNAL_ISSUES_URL")
+    val enableWiki           = column[Boolean]("ENABLE_WIKI")
+    val allowWikiEditing     = column[Boolean]("ALLOW_WIKI_EDITING")
+    val externalWikiUrl      = column[String]("EXTERNAL_WIKI_URL")
+    val allowFork            = column[Boolean]("ALLOW_FORK")
+
+    def * = (
+      (userName, repositoryName, isPrivate, description.?, defaultBranch,
+      registeredDate, updatedDate, lastActivityDate, originUserName.?, originRepositoryName.?, parentUserName.?, parentRepositoryName.?),
+      (enableIssues, externalIssuesUrl.?, enableWiki, allowWikiEditing, externalWikiUrl.?, allowFork)
+    ).shaped <> (
+      { case (repository, options) =>
+        Repository(
+          repository._1,
+          repository._2,
+          repository._3,
+          repository._4,
+          repository._5,
+          repository._6,
+          repository._7,
+          repository._8,
+          repository._9,
+          repository._10,
+          repository._11,
+          repository._12,
+          RepositoryOptions.tupled.apply(options)
+        )
+      }, { (r: Repository) =>
+        Some(((
+          r.userName,
+          r.repositoryName,
+          r.isPrivate,
+          r.description,
+          r.defaultBranch,
+          r.registeredDate,
+          r.updatedDate,
+          r.lastActivityDate,
+          r.originUserName,
+          r.originRepositoryName,
+          r.parentUserName,
+          r.parentRepositoryName
+        ),(
+          RepositoryOptions.unapply(r.options).get
+        )))
+      })

    def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
  }
@@ -43,9 +81,14 @@ case class Repository(
  originRepositoryName: Option[String],
  parentUserName: Option[String],
  parentRepositoryName: Option[String],
+  options: RepositoryOptions
+)
+
+case class RepositoryOptions(
  enableIssues: Boolean,
  externalIssuesUrl: Option[String],
  enableWiki: Boolean,
  allowWikiEditing: Boolean,
-  externalWikiUrl: Option[String]
+  externalWikiUrl: Option[String],
+  allowFork: Boolean
 )
--- a/src/main/scala/gitbucket/core/service/AccountService.scala
+++ b/src/main/scala/gitbucket/core/service/AccountService.scala
@@ -181,7 +181,6 @@ trait AccountService {
  def removeUserRelatedData(userName: String)(implicit s: Session): Unit = {
    GroupMembers.filter(_.userName === userName.bind).delete
    Collaborators.filter(_.collaboratorName === userName.bind).delete
-    Repositories.filter(_.userName === userName.bind).delete
  }

  def getGroupNames(userName: String)(implicit s: Session): List[String] = {
--- a/src/main/scala/gitbucket/core/service/IssuesService.scala
+++ b/src/main/scala/gitbucket/core/service/IssuesService.scala
@@ -163,66 +163,62 @@ trait IssuesService {
                 (implicit s: Session): List[IssueInfo] = {
    // get issues and comment count and labels
    val result = searchIssueQueryBase(condition, pullRequest, offset, limit, repos)
-        .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
-        .leftJoin (Labels)      .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
-        .leftJoin (Milestones)  .on { case ((((t1, t2), t3), t4), t5) => t1.byMilestone(t5.userName, t5.repositoryName, t5.milestoneId) }
-        .map { case ((((t1, t2), t3), t4), t5) =>
-          (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?, t5.title.?)
-        }
-        .list
-        .splitWith { (c1, c2) =>
-          c1._1.userName       == c2._1.userName &&
-          c1._1.repositoryName == c2._1.repositoryName &&
-          c1._1.issueId        == c2._1.issueId
-        }
+      .leftJoin (IssueLabels) .on { case (((t1, t2), i), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
+      .leftJoin (Labels)      .on { case ((((t1, t2), i), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
+      .leftJoin (Milestones)  .on { case (((((t1, t2), i), t3), t4), t5) => t1.byMilestone(t5.userName, t5.repositoryName, t5.milestoneId) }
+      .sortBy { case (((((t1, t2), i), t3), t4), t5) => i asc }
+      .map { case (((((t1, t2), i), t3), t4), t5) => (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?, t5.title.?) }
+      .list
+      .splitWith { (c1, c2) => c1._1.userName == c2._1.userName && c1._1.repositoryName == c2._1.repositoryName && c1._1.issueId == c2._1.issueId }
+
    val status = getCommitStatues(result.map(_.head._1).map(is => (is.userName, is.repositoryName, is.issueId)))

    result.map { issues => issues.head match {
-          case (issue, commentCount, _, _, _, milestone) =>
-            IssueInfo(issue,
-             issues.flatMap { t => t._3.map (
-                 Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get)
-             )} toList,
-             milestone,
-             commentCount,
-             status.get(issue.userName, issue.repositoryName, issue.issueId))
-        }} toList
+      case (issue, commentCount, _, _, _, milestone) =>
+        IssueInfo(issue,
+          issues.flatMap { t => t._3.map (
+            Label(issue.userName, issue.repositoryName, _, t._4.get, t._5.get)
+          )} toList,
+          milestone,
+          commentCount,
+          status.get(issue.userName, issue.repositoryName, issue.issueId))
+    }} toList
  }

  /** for api
   * @return (issue, issueUser, commentCount, pullRequest, headRepo, headOwner)
   */
  def searchPullRequestByApi(condition: IssueSearchCondition, offset: Int, limit: Int, repos: (String, String)*)
-                 (implicit s: Session): List[(Issue, Account, Int, PullRequest, Repository, Account)] = {
+                            (implicit s: Session): List[(Issue, Account, Int, PullRequest, Repository, Account)] = {
    // get issues and comment count and labels
    searchIssueQueryBase(condition, true, offset, limit, repos)
-      .innerJoin(PullRequests).on { case ((t1, t2), t3) => t3.byPrimaryKey(t1.userName, t1.repositoryName, t1.issueId) }
-      .innerJoin(Repositories).on { case (((t1, t2), t3), t4) => t4.byRepository(t1.userName, t1.repositoryName) }
-      .innerJoin(Accounts).on { case ((((t1, t2), t3), t4), t5) => t5.userName === t1.openedUserName }
-      .innerJoin(Accounts).on { case (((((t1, t2), t3), t4), t5), t6) => t6.userName === t4.userName }
-      .map { case (((((t1, t2), t3), t4), t5), t6) =>
-          (t1, t5, t2.commentCount, t3, t4, t6)
-      }
+      .innerJoin(PullRequests).on { case (((t1, t2), i), t3) => t3.byPrimaryKey(t1.userName, t1.repositoryName, t1.issueId) }
+      .innerJoin(Repositories).on { case ((((t1, t2), i), t3), t4) => t4.byRepository(t1.userName, t1.repositoryName) }
+      .innerJoin(Accounts).on { case (((((t1, t2), i), t3), t4), t5) => t5.userName === t1.openedUserName }
+      .innerJoin(Accounts).on { case ((((((t1, t2), i), t3), t4), t5), t6) => t6.userName === t4.userName }
+      .sortBy { case ((((((t1, t2), i), t3), t4), t5), t6) => i asc }
+      .map { case ((((((t1, t2), i), t3), t4), t5), t6) => (t1, t5, t2.commentCount, t3, t4, t6) }
      .list
  }

  private def searchIssueQueryBase(condition: IssueSearchCondition, pullRequest: Boolean, offset: Int, limit: Int, repos: Seq[(String, String)])
-                 (implicit s: Session) =
+                                  (implicit s: Session) =
    searchIssueQuery(repos, condition, pullRequest)
-        .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) }
-        .sortBy { case (t1, t2) =>
-          (condition.sort match {
-            case "created"  => t1.registeredDate
-            case "comments" => t2.commentCount
-            case "updated"  => t1.updatedDate
-          }) match {
-            case sort => condition.direction match {
-              case "asc"  => sort asc
-              case "desc" => sort desc
-            }
+      .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) }
+      .sortBy { case (t1, t2) => t1.issueId desc }
+      .sortBy { case (t1, t2) =>
+        (condition.sort match {
+          case "created"  => t1.registeredDate
+          case "comments" => t2.commentCount
+          case "updated"  => t1.updatedDate
+        }) match {
+          case sort => condition.direction match {
+            case "asc"  => sort asc
+            case "desc" => sort desc
          }
        }
-        .drop(offset).take(limit)
+      }
+      .drop(offset).take(limit).zipWithIndex


  /**
--- a/src/main/scala/gitbucket/core/service/RepositoryService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala
@@ -1,7 +1,7 @@
 package gitbucket.core.service

 import gitbucket.core.controller.Context
-import gitbucket.core.model.{Collaborator, Repository, Account}
+import gitbucket.core.model.{Collaborator, Repository, RepositoryOptions, Account}
 import gitbucket.core.model.Profile._
 import gitbucket.core.util.JGitUtil
 import profile.simple._
@@ -37,11 +37,14 @@ trait RepositoryService { self: AccountService =>
        originRepositoryName = originRepositoryName,
        parentUserName       = parentUserName,
        parentRepositoryName = parentRepositoryName,
-        enableIssues         = true,
-        externalIssuesUrl    = None,
-        enableWiki           = true,
-        allowWikiEditing     = true,
-        externalWikiUrl      = None
+        options              = RepositoryOptions(
+          enableIssues         = true,
+          externalIssuesUrl    = None,
+          enableWiki           = true,
+          allowWikiEditing     = true,
+          externalWikiUrl      = None,
+          allowFork            = true
+        )
      )

    IssueId insert (userName, repositoryName, 0)
@@ -321,10 +324,11 @@ trait RepositoryService { self: AccountService =>
  def saveRepositoryOptions(userName: String, repositoryName: String,
      description: Option[String], isPrivate: Boolean,
      enableIssues: Boolean, externalIssuesUrl: Option[String],
-      enableWiki: Boolean, allowWikiEditing: Boolean, externalWikiUrl: Option[String])(implicit s: Session): Unit =
+      enableWiki: Boolean, allowWikiEditing: Boolean, externalWikiUrl: Option[String],
+      allowFork: Boolean)(implicit s: Session): Unit =
    Repositories.filter(_.byRepository(userName, repositoryName))
-      .map { r => (r.description.?, r.isPrivate, r.enableIssues, r.externalIssuesUrl.?, r.enableWiki, r.allowWikiEditing, r.externalWikiUrl.?, r.updatedDate) }
-      .update (description, isPrivate, enableIssues, externalIssuesUrl, enableWiki, allowWikiEditing, externalWikiUrl, currentDate)
+      .map { r => (r.description.?, r.isPrivate, r.enableIssues, r.externalIssuesUrl.?, r.enableWiki, r.allowWikiEditing, r.externalWikiUrl.?, r.allowFork, r.updatedDate) }
+      .update (description, isPrivate, enableIssues, externalIssuesUrl, enableWiki, allowWikiEditing, externalWikiUrl, allowFork, currentDate)

  def saveRepositoryDefaultBranch(userName: String, repositoryName: String,
      defaultBranch: String)(implicit s: Session): Unit =
--- a/src/main/scala/gitbucket/core/servlet/GHCompatRepositoryAccessFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/GHCompatRepositoryAccessFilter.scala
@@ -0,0 +1,36 @@
+package gitbucket.core.servlet
+
+import javax.servlet._
+import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
+
+import gitbucket.core.service.SystemSettingsService
+
+/**
+  * A controller to provide GitHub compatible URL for Git clients.
+  */
+class GHCompatRepositoryAccessFilter extends Filter with SystemSettingsService {
+
+  /**
+    * Pattern of GitHub compatible repository URL.
+    * <code>/:user/:repo.git/</code>
+    */
+  private val githubRepositoryPattern = """^/[^/]+/[^/]+\.git/.*""".r
+
+  override def init(filterConfig: FilterConfig) = {}
+
+  override def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain) = {
+    implicit val request  = req.asInstanceOf[HttpServletRequest]
+    val response = res.asInstanceOf[HttpServletResponse]
+    val requestPath = request.getRequestURI.substring(request.getContextPath.length)
+    requestPath match {
+      case githubRepositoryPattern() =>
+        response.sendRedirect(baseUrl + "/git" + requestPath)
+
+      case _ =>
+        chain.doFilter(req, res)
+    }
+  }
+
+  override def destroy() = {}
+
+}
--- a/src/main/scala/gitbucket/core/util/StringUtil.scala
+++ b/src/main/scala/gitbucket/core/util/StringUtil.scala
@@ -86,8 +86,9 @@ object StringUtil {
   *@param message the message which may contains issue id
   * @return the iterator of issue id
   */
-  def extractIssueId(message: String): Iterator[String] =
-    "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(message).matchData.map(_.group(2))
+  def extractIssueId(message: String): Seq[String] =
+    "(^|\\W)#(\\d+)(\\W|$)".r
+      .findAllIn(message).matchData.map(_.group(2)).toSeq.distinct

  /**
   * Extract close issue id like ```close #issueId ``` from the given message.
@@ -95,7 +96,8 @@ object StringUtil {
   * @param message the message which may contains close command
   * @return the iterator of issue id
   */
-  def extractCloseId(message: String): Iterator[String] =
-    "(?i)(?<!\\w)(?:fix(?:e[sd])?|resolve[sd]?|close[sd]?)\\s+#(\\d+)(?!\\w)".r.findAllIn(message).matchData.map(_.group(1))
+  def extractCloseId(message: String): Seq[String] =
+    "(?i)(?<!\\w)(?:fix(?:e[sd])?|resolve[sd]?|close[sd]?)\\s+#(\\d+)(?!\\w)".r
+      .findAllIn(message).matchData.map(_.group(1)).toSeq.distinct

 }
--- a/src/main/twirl/gitbucket/core/account/members.scala.html
+++ b/src/main/twirl/gitbucket/core/account/members.scala.html
@@ -1,13 +1,14 @@
-@(account: gitbucket.core.model.Account, members: List[String], isGroupManager: Boolean)(implicit context: gitbucket.core.controller.Context)
+@(account: gitbucket.core.model.Account, members: List[gitbucket.core.model.GroupMember], isGroupManager: Boolean)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
@gitbucket.core.account.html.main(account, Nil, "members", isGroupManager){
  @if(members.isEmpty){
    No members
  } else {
-    @members.map { userName =>
+    @members.map { member =>
      <div class="block">
        <div class="block-header">
-          @helpers.avatar(userName, 20) <a href="@helpers.url(userName)">@userName</a>
+          @helpers.avatar(member.userName, 20) <a href="@helpers.url(member.userName)">@member.userName</a>
+          @if(member.isManager){ (Manager) }
        </div>
      </div>
    }
--- a/src/main/twirl/gitbucket/core/main.scala.html
+++ b/src/main/twirl/gitbucket/core/main.scala.html
@@ -39,7 +39,7 @@
    }
    <script src="@helpers.assets/vendors/AdminLTE-2.3.6/js/app.js" type="text/javascript"></script>
  </head>
-  <body class="skin-blue">
+  <body class="skin-blue page-load">
    <div class="wrapper">
      <header class="main-header">
        <a href="@context.path/" class="logo">
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -9,11 +9,11 @@
  <li @if(active == name){class="active"}>
    @if(path.startsWith("http")){
      <a href="@path" target="_blank">
-        <i class="menu-icon octicon octicon-@icon"></i> @label @if(count > 0) { <span class="label label-primary pull-right">@count</span> }
+        <i class="menu-icon octicon octicon-@icon"></i> @label @if(count > 0) { <span class="label label-primary pull-right-container">@count</span> }
      </a>
    } else {
      <a href="@helpers.url(repository)@path">
-        <i class="menu-icon octicon octicon-@icon"></i> @label @if(count > 0) { <span class="label label-primary pull-right">@count</span> }
+        <i class="menu-icon octicon octicon-@icon"></i> @label @if(count > 0) { <span class="label label-primary pull-right-container">@count</span> }
      </a>
    }
  </li>
@@ -27,24 +27,26 @@
          @menuitem("/branches", "branches", "Branches", "git-branch", repository.branchList.length)
          @menuitem("/tags", "tags", "Tags", "tag", repository.tags.length)
        }
-        @if(repository.repository.enableIssues) {
+        @if(repository.repository.options.enableIssues) {
          @menuitem("/issues", "issues", "Issues", "issue-opened", repository.issueCount)
          @menuitem("/pulls", "pulls", "Pull Requests", "git-pull-request", repository.pullCount)
          @menuitem("/issues/labels", "labels", "Labels", "tag")
          @menuitem("/issues/milestones", "milestones", "Milestones", "milestone")
        } else {
-          @repository.repository.externalIssuesUrl.map { externalIssuesUrl =>
+          @repository.repository.options.externalIssuesUrl.map { externalIssuesUrl =>
            @menuitem(externalIssuesUrl, "issues", "Issues", "issue-opened")
          }
        }
-        @if(repository.repository.enableWiki) {
+        @if(repository.repository.options.enableWiki) {
          @menuitem("/wiki", "wiki", "Wiki", "book")
        } else {
-          @repository.repository.externalWikiUrl.map { externalWikiUrl =>
+          @repository.repository.options.externalWikiUrl.map { externalWikiUrl =>
            @menuitem(externalWikiUrl, "wiki", "Wiki", "book")
          }
        }
-        @menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount)
+        @if(repository.repository.options.allowFork) {
+          @menuitem("/network/members", "fork", "Forks", "repo-forked", repository.forkedCount)
+        }
        @if(context.loginAccount.isDefined && (context.loginAccount.get.isAdmin || repository.managers.contains(context.loginAccount.get.userName))){
          @menuitem("/settings", "settings", "Settings", "tools")
        }
--- a/src/main/twirl/gitbucket/core/repo/blob.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html
@@ -73,7 +73,7 @@
            </div>
          } else {
            <div class="box-content-bottom">
-              <pre class="prettyprint linenums blob @if(!isRenderable){ no-renderable } ">@content.content.get</pre>
+              <pre class="prettyprint linenums blob @if(!isRenderable){ no-renderable } ">@content.content.map(_.replaceAll("^(\r?\n)", "$1$1"))</pre>
            </div>
          }
        }
--- a/src/main/twirl/gitbucket/core/settings/options.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/options.scala.html
@@ -46,7 +46,7 @@
          <div class="panel-body">
            <fieldset class="form-group">
              <label class="checkbox" for="enableIssues">
-                <input type="checkbox" id="enableIssues" name="enableIssues"@if(repository.repository.enableIssues){ checked}/>
+                <input type="checkbox" id="enableIssues" name="enableIssues"@if(repository.repository.options.enableIssues){ checked}/>
                Issues<br>
                <div class="normal muted">
                  Provides Lightweight issue tracking integrated with this repository. Add issues to milestones, label issues, and close & reference issues from commit messages.
@@ -55,24 +55,33 @@
              <label for="externalIssuesUrl" class="strong">External URL:
                <span class="normal muted">(Put if you have the external issue tracking system for this project)</span>
              </label>
-              <input type="text" class="form-control" id="externalIssuesUrl" name="externalIssuesUrl" value="@repository.repository.externalIssuesUrl"/>
+              <input type="text" class="form-control" id="externalIssuesUrl" name="externalIssuesUrl" value="@repository.repository.options.externalIssuesUrl"/>
            </fieldset>
-            <fieldset class="form-group margin">
+            <fieldset class="form-group">
              <label class="checkbox" for="enableWiki">
-                <input type="checkbox" id="enableWiki" name="enableWiki"@if(repository.repository.enableWiki){ checked}/>
+                <input type="checkbox" id="enableWiki" name="enableWiki"@if(repository.repository.options.enableWiki){ checked}/>
                Wiki<br>
                <div class="normal muted">
                  Provides a simple solution to manage documents. All users who can look this repository can read and collaborators can edit pages.
                </div>
              </label>
              <label class="checkbox" for="allowWikiEditing">
-                <input type="checkbox" id="allowWikiEditing" name="allowWikiEditing"@if(repository.repository.allowWikiEditing){ checked}/>
+                <input type="checkbox" id="allowWikiEditing" name="allowWikiEditing"@if(repository.repository.options.allowWikiEditing){ checked}/>
                Allow read-only users to edit Wiki pages<br>
              </label>
              <label for="externalWikiUrl" class="strong">External URL:
                <span class="normal muted">(Put if you have the external Wiki for this project)</span>
              </label>
-              <input type="text" class="form-control" id="externalWikiUrl" name="externalWikiUrl" value="@repository.repository.externalWikiUrl"/>
+              <input type="text" class="form-control" id="externalWikiUrl" name="externalWikiUrl" value="@repository.repository.options.externalWikiUrl"/>
+            </fieldset>
+            <fieldset class="form-group">
+              <label class="checkbox" for="allowFork">
+                <input type="checkbox" id="allowFork" name="allowFork"@if(repository.repository.options.allowFork){ checked}/>
+                Forks<br>
+                <div class="normal muted">
+                  Allow repository forking to users who can access this repository.
+                </div>
+              </label>
            </fieldset>
          </div>
        </div>
--- a/src/main/twirl/gitbucket/core/wiki/page.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/page.scala.html
@@ -10,12 +10,13 @@
@gitbucket.core.html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
  @gitbucket.core.html.menu("wiki", repository){
    <div>
-      @if(hasWritePermission){
-        <div class="pull-right">
+      <div class="pull-right">
+        <a class="btn btn-small btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_history">Page History</a>
+        @if(hasWritePermission){
          <a class="btn btn-default" href="@helpers.url(repository)/wiki/@helpers.urlEncode(pageName)/_edit">Edit Page</a>
          <a class="btn btn-success" href="@helpers.url(repository)/wiki/_new">New Page</a>
-        </div>
-      }
+        }
+      </div>
      <h1 class="body-title">@pageName</h1>
      <div>
        <span class="muted"><strong>@page.committer</strong> edited this page @gitbucket.core.helper.html.datetimeago(page.time)</span>
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -1762,3 +1762,14 @@ div.container.blame-container{
  width: 20px;
  height: 20px;
 }
+
+/****************************************************************************/
+/* Suppress transition animation on load */
+/****************************************************************************/
+body.page-load * {
+    -webkit-transition: none !important;
+    -moz-transition: none !important;
+    -ms-transition: none !important;
+    -o-transition: none !important;
+    transition: none !important;
+}
--- a/src/main/webapp/assets/common/images/gitbucket.png
+++ b/src/main/webapp/assets/common/images/gitbucket.png
--- a/src/main/webapp/assets/common/js/gitbucket.js
+++ b/src/main/webapp/assets/common/js/gitbucket.js
@@ -28,6 +28,9 @@ $(function(){

  // syntax highlighting by google-code-prettify
  prettyPrint();
+
+  // Suppress transition animation on load
+  $("body").removeClass("page-load");
 });

 function displayErrors(data, elem){
--- a/src/test/scala/gitbucket/core/service/ProtectedBranchServiceSpec.scala
+++ b/src/test/scala/gitbucket/core/service/ProtectedBranchServiceSpec.scala
@@ -5,7 +5,6 @@ import org.eclipse.jgit.transport.{ReceivePack, ReceiveCommand}
 import org.eclipse.jgit.lib.ObjectId
 import gitbucket.core.model.CommitState
 import gitbucket.core.service.ProtectedBranchService.{ProtectedBranchReceiveHook, ProtectedBranchInfo}
-import scalaz._, Scalaz._
 import org.scalatest.FunSpec

 class ProtectedBranchServiceSpec extends FunSpec with ServiceSpecBase with ProtectedBranchService with CommitStatusService {
@@ -187,4 +186,4 @@ class ProtectedBranchServiceSpec extends FunSpec with ServiceSpecBase with Prote
      }
    }
  }
-}
+}
--- a/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
+++ b/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
@@ -9,8 +9,6 @@ import io.github.gitbucket.solidbase.Solidbase
 import liquibase.database.core.H2Database
 import liquibase.database.jvm.JdbcConnection
 import profile.simple._
-import scalaz._
-import Scalaz._

 import org.apache.commons.io.FileUtils
Author	SHA1	Message	Date
Naoki Takezoe	7d3bda42e2	Update version	2016-10-29 15:00:20 +09:00
Naoki Takezoe	83a39f1e39	Update README.md	2016-10-29 15:00:01 +09:00
Naoki Takezoe	de726d8d96	(refs #1325 ) Prepend one more empty line when the first line is an empty line.	2016-10-26 12:21:21 +09:00
Naoki Takezoe	91bb241e8c	(refs #1334 ) Indicate who is group manager	2016-10-26 10:44:20 +09:00
Naoki Takezoe	8da55d8aa8	Merge pull request #1311 from gitbucket/fix-issues-sorting (refs #1308)Fix issues sorting	2016-10-19 01:29:00 +09:00
Naoki Takezoe	3355c46503	(refs #1308 )Fix issues sorting again	2016-10-18 02:30:23 +09:00
Naoki Takezoe	0a3d457218	Merge pull request #1328 from kw-udon/custom-media-type-in-content-api Support custom media types in get-content API	2016-10-17 09:31:24 +09:00
Naoki Takezoe	7fa5fdfbd0	Merge pull request #1326 from kounoike/pr/suppress-transition-on-load-in-ie Suppress noisy transition animation on load in IE11	2016-10-17 01:14:43 +09:00
Naoki Takezoe	95f88891d0	Merge pull request #1327 from kounoike/pr/fix-logo Cleanup white pixels in gitbucket logo.	2016-10-17 01:13:20 +09:00
Keiichi Watanabe	550f8f415c	Support custom media types in get-content API cf. https://developer.github.com/v3/repos/contents/#custom-media-types	2016-10-16 20:31:26 +09:00
KOUNOIKE Yuusuke	5ab947d8ec	Cleanup white pixels in gitbucket logo.	2016-10-16 13:02:20 +09:00
KOUNOIKE Yuusuke	ec793535e7	Suppress noisy transition animation on load in IE11 http://stackoverflow.com/a/25674229	2016-10-16 12:44:43 +09:00
Naoki Takezoe	2f1d81cc4c	Create issue comment by online file editing as well	2016-10-13 20:36:11 +09:00
Naoki Takezoe	0f189ca710	(refs #1319 )Get rid of the duplication of issue id extracted from commit message	2016-10-13 20:24:01 +09:00
Naoki Takezoe	6afd51bb8d	(refs #1312 )Fix badge position on the side menu	2016-10-13 06:42:58 +09:00
Naoki Takezoe	e415f9d24e	(refs #1316 )Add "Page History" button to the wiki page view	2016-10-13 00:59:19 +09:00
Naoki Takezoe	ba5d587a1e	Merge pull request #1321 from int128/gh-compatibility Improve GitHub compatibility for Jenkins	2016-10-11 12:32:43 +09:00
Naoki Takezoe	92f778b6e9	Merge pull request #1320 from kw-udon/file-content-api Add API to get a file content	2016-10-10 18:12:03 +09:00
Hidetake Iwata	b52981a845	Provide GitHub compatible URL for Git clients	2016-10-10 15:13:47 +09:00
Keiichi Watanabe	9c5d3edc72	Add API to get a file content	2016-10-10 02:04:43 +09:00
Naoki Takezoe	56d68c6145	Merge pull request #1313 from xuwei-k/remove-scalaz remove unused scalaz	2016-10-05 17:45:01 +09:00
xuwei-k	4d13282915	remove unused scalaz	2016-10-05 12:14:43 +09:00
Naoki Takezoe	872320ccab	(refs #1129 )Not use Option.get for non-able value	2016-10-04 10:28:47 +09:00
Naoki Takezoe	28ee80b727	(refs #1129 )Not delete from REPOSITORY table when user is disabled	2016-10-03 16:55:20 +09:00
Naoki Takezoe	2621de2cde	Fix error responses	2016-10-03 16:01:57 +09:00
Naoki Takezoe	82b102845f	(refs #1292 )Add new option to disable repository forking	2016-10-03 15:26:23 +09:00
Naoki Takezoe	28c9f8b89a	(refs #1308 )Fix sorting in issue query	2016-10-03 01:42:56 +09:00
Naoki Takezoe	23fa937fd1	Remove unnecessary lines	2016-10-02 02:27:48 +09:00
Naoki Takezoe	02330a2050	(refs #1304 )Remove package artifact overriding	2016-10-01 03:24:21 +09:00