(refs #256 )If account is already registered but disabled, authentication fails.

Merge remote-tracking branch 'origin/master'
(refs #251 )Remove BOM from UTF-8 string.
2026-05-08 18:35:36 +02:00 · 2014-02-01 17:05:33 +09:00 · 2014-02-01 07:08:39 +09:00 · 2014-02-01 07:08:03 +09:00 · 2014-02-01 07:06:17 +09:00 · 2014-02-01 06:11:18 +09:00
39 changed files with 705 additions and 434 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ project/plugins/project/
 .classpath
 .project
 .cache
+.settings

 # IntelliJ specific
 .idea/
--- a/README.md
+++ b/README.md
@@ -49,21 +49,33 @@ To upgrade GitBucket, only replace gitbucket.war. All GitBucket data is stored i

 For Installation on Windows Server with IIS see [this wiki page](https://github.com/takezoe/gitbucket/wiki/Installation-on-IIS-and-Helicontech-Zoo)

+### Mac OS X
+On OS X, copy the [gitbucket.plist](https://raw.github.com/takezoe/gitbucket/master/contrib/macosx/gitbucket.plist) file to `~/Library/LaunchAgents/`
+
+Run the following commands in `Terminal` to
+
+- start gitbucket: `launchctl load ~/Library/LaunchAgents/gitbucket.plist`
+- stop gitbucket: `launchctl unload ~/Library/LaunchAgents/gitbucket.plist`
+
 Release Notes
 --------
-### 1.8 - COMMING SOON!
+### 1.9 - 28 Dec 2013
+- Display GITBUCKET_HOME on the system settings page
+- Fix some bugs
+
+### 1.8 - 30 Nov 2013
 - Add user and group deletion
 - Improve pull request performance
 - Pull request synchronization (when source repository is updated after pull request, it's applied to the pull request)
 - LDAP StartTLS support
- Hard wrap for Markdown
- Add new some options to specify the data directory
+- Enable hard wrapping in Markdown
+- Add new some options to specify the data directory. See details in [Wiki](https://github.com/takezoe/gitbucket/wiki/DirectoryStructure).
 - Fix some bugs

 ### 1.7 - 26 Oct 2013
 - Support working on Java6 in embedded Jetty mode
 - Add ```--host``` option to bind specified host name in embedded Jetty mode
- Add ```--https=true``` option to use https in embedded Jetty mode
+- Add ```--https=true``` option to force https scheme when using embedded Jetty mode at the back of https proxy
 - Add full name as user property
 - Change link color for absent Wiki pages
 - Add ZIP download button to the repository viewer tab
--- a/contrib/macosx/gitbucket.plist
+++ b/contrib/macosx/gitbucket.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>Label</key>
+    <string>gitbucket</string>
+    <key>ProgramArguments</key>
+    <array>
+      <string>/usr/bin/java</string>
+      <string>-Dmail.smtp.starttls.enable=true</string>
+      <string>-jar</string>
+      <string>gitbucket.war</string>
+      <string>--host=127.0.0.1</string>
+      <string>--port=8080</string>
+      <string>--https=true</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+  </dict>
+</plist>
--- a/project/build.scala
+++ b/project/build.scala
@@ -1,8 +1,6 @@
 import sbt._
 import Keys._
 import org.scalatra.sbt._
-import org.scalatra.sbt.PluginKeys._
-import sbt.ScalaVersion
 import twirl.sbt.TwirlPlugin._
 import com.typesafe.sbteclipse.plugin.EclipsePlugin.EclipseKeys

@@ -25,14 +23,14 @@ object MyBuild extends Build {
        Classpaths.typesafeReleases,
        "amateras-repo" at "http://amateras.sourceforge.jp/mvn/"
      ),
-      scalacOptions := Seq("-deprecation"),
+      scalacOptions := Seq("-deprecation", "-language:postfixOps"),
      libraryDependencies ++= Seq(
        "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "3.0.0.201306101825-r",
        "org.scalatra" %% "scalatra" % ScalatraVersion,
        "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
        "org.scalatra" %% "scalatra-json" % ScalatraVersion,
        "org.json4s" %% "json4s-jackson" % "3.2.5",
-        "jp.sf.amateras" %% "scalatra-forms" % "0.0.8",
+        "jp.sf.amateras" %% "scalatra-forms" % "0.0.11",
        "commons-io" % "commons-io" % "2.4",
        "org.pegdown" % "pegdown" % "1.4.1",
        "org.apache.commons" % "commons-compress" % "1.5",
@@ -43,7 +41,7 @@ object MyBuild extends Build {
        "com.h2database" % "h2" % "1.3.173",
        "ch.qos.logback" % "logback-classic" % "1.0.13" % "runtime",
        "org.eclipse.jetty" % "jetty-webapp" % "8.1.8.v20121106" % "container;provided",
-        "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;provided;test" artifacts (Artifact("javax.servlet", "jar", "jar")),
+        "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;provided;test" artifacts Artifact("javax.servlet", "jar", "jar"),
        "junit" % "junit" % "4.11" % "test"
      ),
      EclipseKeys.withSource := true,
--- a/src/main/scala/ScalatraBootstrap.scala
+++ b/src/main/scala/ScalatraBootstrap.scala
@@ -17,7 +17,6 @@ class ScalatraBootstrap extends LifeCycle {
    context.mount(new IndexController, "/")
    context.mount(new SearchController, "/")
    context.mount(new FileUploadController, "/upload")
-    context.mount(new SignInController, "/*")
    context.mount(new DashboardController, "/*")
    context.mount(new UserManagementController, "/*")
    context.mount(new SystemSettingsController, "/*")
--- a/src/main/scala/app/CreateRepositoryController.scala
+++ b/src/main/scala/app/CreateRepositoryController.scala
@@ -113,54 +113,62 @@ trait CreateRepositoryControllerBase extends ControllerBase {
    val loginUserName  = loginAccount.userName

    LockUtil.lock(s"${loginUserName}/${repository.name}/create"){
-      if(getRepository(loginUserName, repository.name, baseUrl).isEmpty){
-        // Insert to the database at first
-        val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
-        val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name)
+      if(repository.owner == loginUserName){
+        // redirect to the repository
+        redirect(s"/${repository.owner}/${repository.name}")
+      } else {
+        getForkedRepositories(repository.owner, repository.name).find(_._1 == loginUserName).map { case (owner, name) =>
+          // redirect to the repository
+          redirect(s"/${owner}/${name}")
+        } getOrElse {
+          // Insert to the database at first
+          val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
+          val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name)

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

-        // Insert default labels
-        insertDefaultLabels(loginUserName, repository.name)
+          // Insert default labels
+          insertDefaultLabels(loginUserName, repository.name)

-        // clone repository actually
-        JGitUtil.cloneRepository(
-          getRepositoryDir(repository.owner, repository.name),
-          getRepositoryDir(loginUserName, repository.name))
+          // clone repository actually
+          JGitUtil.cloneRepository(
+            getRepositoryDir(repository.owner, repository.name),
+            getRepositoryDir(loginUserName, repository.name))

-        // Create Wiki repository
-        JGitUtil.cloneRepository(
-          getWikiRepositoryDir(repository.owner, repository.name),
-          getWikiRepositoryDir(loginUserName, repository.name))
+          // Create Wiki repository
+          JGitUtil.cloneRepository(
+            getWikiRepositoryDir(repository.owner, repository.name),
+            getWikiRepositoryDir(loginUserName, repository.name))

-        // insert commit id
-        using(Git.open(getRepositoryDir(loginUserName, repository.name))){ git =>
-          JGitUtil.getRepositoryInfo(loginUserName, repository.name, baseUrl).branchList.foreach { branch =>
-            JGitUtil.getCommitLog(git, branch) match {
-              case Right((commits, _)) => commits.foreach { commit =>
-                if(!existsCommitId(loginUserName, repository.name, commit.id)){
-                  insertCommitId(loginUserName, repository.name, commit.id)
+          // insert commit id
+          using(Git.open(getRepositoryDir(loginUserName, repository.name))){ git =>
+            JGitUtil.getRepositoryInfo(loginUserName, repository.name, baseUrl).branchList.foreach { branch =>
+              JGitUtil.getCommitLog(git, branch) match {
+                case Right((commits, _)) => commits.foreach { commit =>
+                  if(!existsCommitId(loginUserName, repository.name, commit.id)){
+                    insertCommitId(loginUserName, repository.name, commit.id)
+                  }
                }
+                case Left(_) => ???
              }
-              case Left(_) => ???
            }
          }
-        }

-        // Record activity
-        recordForkActivity(repository.owner, repository.name, loginUserName)
+          // Record activity
+          recordForkActivity(repository.owner, repository.name, loginUserName)
+          // redirect to the repository
+          redirect(s"/${loginUserName}/${repository.name}")
+        }
      }
-      // redirect to the repository
-      redirect("/%s/%s".format(loginUserName, repository.name))
    }
  })

--- a/src/main/scala/app/IndexController.scala
+++ b/src/main/scala/app/IndexController.scala
@@ -1,6 +1,7 @@
 package app

 import util._
+import util.Implicits._
 import service._
 import jp.sf.amateras.scalatra.forms._

@@ -9,8 +10,14 @@ class IndexController extends IndexControllerBase
 with UsersAuthenticator

 trait IndexControllerBase extends ControllerBase {
-  self: RepositoryService with SystemSettingsService with ActivityService with AccountService
-  with UsersAuthenticator =>
+  self: RepositoryService with SystemSettingsService with ActivityService with AccountService with UsersAuthenticator =>
+
+  case class SignInForm(userName: String, password: String)
+
+  val form = mapping(
+    "userName" -> trim(label("Username", text(required))),
+    "password" -> trim(label("Password", text(required)))
+  )(SignInForm.apply)

  get("/"){
    val loginAccount = context.loginAccount
@@ -22,6 +29,44 @@ trait IndexControllerBase extends ControllerBase {
    )
  }

+  get("/signin"){
+    val redirect = params.get("redirect")
+    if(redirect.isDefined && redirect.get.startsWith("/")){
+      session.setAttribute(Keys.Session.Redirect, redirect.get)
+    }
+    html.signin(loadSystemSettings())
+  }
+
+  post("/signin", form){ form =>
+    authenticate(loadSystemSettings(), form.userName, form.password) match {
+      case Some(account) => signin(account)
+      case None          => redirect("/signin")
+    }
+  }
+
+  get("/signout"){
+    session.invalidate
+    redirect("/")
+  }
+
+  /**
+   * Set account information into HttpSession and redirect.
+   */
+  private def signin(account: model.Account) = {
+    session.setAttribute(Keys.Session.LoginAccount, account)
+    updateLastLoginDate(account.userName)
+
+    session.getAndRemove[String](Keys.Session.Redirect).map { redirectUrl =>
+      if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){
+        redirect("/")
+      } else {
+        redirect(redirectUrl)
+      }
+    }.getOrElse {
+      redirect("/")
+    }
+  }
+
  /**
   * JSON API for collaborator completion.
   *
--- a/src/main/scala/app/PullRequestsController.scala
+++ b/src/main/scala/app/PullRequestsController.scala
@@ -18,26 +18,28 @@ import util.JGitUtil.CommitInfo
 import org.slf4j.LoggerFactory
 import org.eclipse.jgit.merge.MergeStrategy
 import org.eclipse.jgit.errors.NoMergeBaseException
+import service.WebHookService.WebHookPayload

 class PullRequestsController extends PullRequestsControllerBase
-  with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with ActivityService
+  with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with ActivityService with WebHookService
  with ReferrerAuthenticator with CollaboratorsAuthenticator

 trait PullRequestsControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with IssuesService with MilestonesService with ActivityService with PullRequestService
+  self: RepositoryService with AccountService with IssuesService with MilestonesService with ActivityService with PullRequestService with WebHookService
    with ReferrerAuthenticator with CollaboratorsAuthenticator =>

  private val logger = LoggerFactory.getLogger(classOf[PullRequestsControllerBase])

  val pullRequestForm = mapping(
-    "title"           -> trim(label("Title"  , text(required, maxlength(100)))),
-    "content"         -> trim(label("Content", optional(text()))),
-    "targetUserName"  -> trim(text(required, maxlength(100))),
-    "targetBranch"    -> trim(text(required, maxlength(100))),
-    "requestUserName" -> trim(text(required, maxlength(100))),
-    "requestBranch"   -> trim(text(required, maxlength(100))),
-    "commitIdFrom"    -> trim(text(required, maxlength(40))),
-    "commitIdTo"      -> trim(text(required, maxlength(40)))
+    "title"                 -> trim(label("Title"  , text(required, maxlength(100)))),
+    "content"               -> trim(label("Content", optional(text()))),
+    "targetUserName"        -> trim(text(required, maxlength(100))),
+    "targetBranch"          -> trim(text(required, maxlength(100))),
+    "requestUserName"       -> trim(text(required, maxlength(100))),
+    "requestRepositoryName" -> trim(text(required, maxlength(100))),
+    "requestBranch"         -> trim(text(required, maxlength(100))),
+    "commitIdFrom"          -> trim(text(required, maxlength(40))),
+    "commitIdTo"            -> trim(text(required, maxlength(40)))
  )(PullRequestForm.apply)

  val mergeForm = mapping(
@@ -50,6 +52,7 @@ trait PullRequestsControllerBase extends ControllerBase {
    targetUserName: String,
    targetBranch: String,
    requestUserName: String,
+    requestRepositoryName: String,
    requestBranch: String,
    commitIdFrom: String,
    commitIdTo: String)
@@ -90,7 +93,7 @@ trait PullRequestsControllerBase extends ControllerBase {
  ajaxGet("/:owner/:repository/pull/:id/mergeguide")(collaboratorsOnly { repository =>
    params("id").toIntOpt.flatMap{ issueId =>
      val owner = repository.owner
-      val name = repository.name
+      val name  = repository.name
      getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
        pulls.html.mergeguide(
          checkConflictInPullRequest(owner, name, pullreq.branch, pullreq.requestUserName, name, pullreq.requestBranch, issueId),
@@ -103,7 +106,7 @@ trait PullRequestsControllerBase extends ControllerBase {
  post("/:owner/:repository/pull/:id/merge", mergeForm)(collaboratorsOnly { (form, repository) =>
    params("id").toIntOpt.flatMap { issueId =>
      val owner = repository.owner
-      val name = repository.name
+      val name  = repository.name
      LockUtil.lock(s"${owner}/${name}/merge"){
        getPullRequest(owner, name, issueId).map { case (issue, pullreq) =>
          using(Git.open(getRepositoryDir(owner, name))) { git =>
@@ -163,6 +166,16 @@ trait PullRequestsControllerBase extends ControllerBase {
              }
            }

+            // call web hook
+            getWebHookURLs(owner, name) match {
+              case webHookURLs if(webHookURLs.nonEmpty) =>
+                for(ownerAccount <- getAccountByUserName(owner)){
+                  callWebHook(owner, name, webHookURLs,
+                    WebHookPayload(git, loginAccount, mergeBaseRefName, repository, commits.flatten.toList, ownerAccount))
+                }
+              case _ =>
+            }
+
            // notifications
            Notifier().toNotify(repository, issueId, "merge"){
              Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/pull/${issueId}")
@@ -202,73 +215,85 @@ trait PullRequestsControllerBase extends ControllerBase {
    }
  })

-  get("/:owner/:repository/compare/*...*")(referrersOnly { repository =>
+  get("/:owner/:repository/compare/*...*")(referrersOnly { forkedRepository =>
    val Seq(origin, forked) = multiParams("splat")
-    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, repository.owner)
-    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, repository.owner)
+    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, forkedRepository.owner)
+    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, forkedRepository.owner)

-    (getRepository(originOwner, repository.name, baseUrl),
-     getRepository(forkedOwner, repository.name, baseUrl)) match {
-      case (Some(originRepository), Some(forkedRepository)) => {
-        using(
-          Git.open(getRepositoryDir(originOwner, repository.name)),
-          Git.open(getRepositoryDir(forkedOwner, repository.name))
-        ){ case (oldGit, newGit) =>
-          val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
-          val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
-
-          val forkedId = getForkedCommitId(oldGit, newGit,
-            originOwner, repository.name, originBranch,
-            forkedOwner, repository.name, forkedBranch)
-
-          val oldId = oldGit.getRepository.resolve(forkedId)
-          val newId = newGit.getRepository.resolve(forkedBranch)
-
-          val (commits, diffs) = getRequestCompareInfo(
-            originOwner, repository.name, oldId.getName,
-            forkedOwner, repository.name, newId.getName)
-
-          pulls.html.compare(
-            commits,
-            diffs,
-            repository.repository.originUserName.map { userName =>
-              userName :: getForkedRepositories(userName, repository.name)
-            } getOrElse List(repository.owner),
-            originBranch,
-            forkedBranch,
-            oldId.getName,
-            newId.getName,
-            repository,
-            originRepository,
-            forkedRepository,
-            hasWritePermission(repository.owner, repository.name, context.loginAccount))
+    (for(
+      originRepositoryName <- if(originOwner == forkedOwner){
+        Some(forkedRepository.name)
+      } else {
+        forkedRepository.repository.originRepositoryName.orElse {
+          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
        }
+      };
+      originRepository <- getRepository(originOwner, originRepositoryName, baseUrl)
+    ) yield {
+      using(
+        Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
+        Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
+      ){ case (oldGit, newGit) =>
+        val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
+        val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
+
+        val forkedId = getForkedCommitId(oldGit, newGit,
+          originRepository.owner, originRepository.name, originBranch,
+          forkedRepository.owner, forkedRepository.name, forkedBranch)
+
+        val oldId = oldGit.getRepository.resolve(forkedId)
+        val newId = newGit.getRepository.resolve(forkedBranch)
+
+        val (commits, diffs) = getRequestCompareInfo(
+          originRepository.owner, originRepository.name, oldId.getName,
+          forkedRepository.owner, forkedRepository.name, newId.getName)
+
+        pulls.html.compare(
+          commits,
+          diffs,
+          (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
+            case (Some(userName), Some(repositoryName)) => (userName, repositoryName) :: getForkedRepositories(userName, repositoryName)
+            case _ => (forkedRepository.owner, forkedRepository.name) :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
+          },
+          originBranch,
+          forkedBranch,
+          oldId.getName,
+          newId.getName,
+          forkedRepository,
+          originRepository,
+          forkedRepository,
+          hasWritePermission(forkedRepository.owner, forkedRepository.name, context.loginAccount))
      }
-      case _ => NotFound
-    }
+    }) getOrElse NotFound
  })

-  ajaxGet("/:owner/:repository/compare/*...*/mergecheck")(collaboratorsOnly { repository =>
+  ajaxGet("/:owner/:repository/compare/*...*/mergecheck")(collaboratorsOnly { forkedRepository =>
    val Seq(origin, forked) = multiParams("splat")
-    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, repository.owner)
-    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, repository.owner)
+    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, forkedRepository.owner)
+    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, forkedRepository.owner)

-    (getRepository(originOwner, repository.name, baseUrl),
-      getRepository(forkedOwner, repository.name, baseUrl)) match {
-      case (Some(originRepository), Some(forkedRepository)) => {
-        using(
-          Git.open(getRepositoryDir(originOwner, repository.name)),
-          Git.open(getRepositoryDir(forkedOwner, repository.name))
-        ){ case (oldGit, newGit) =>
-          val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
-          val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
-
-          pulls.html.mergecheck(
-            checkConflict(originOwner, repository.name, originBranch, forkedOwner, repository.name, forkedBranch))
+    (for(
+      originRepositoryName <- if(originOwner == forkedOwner){
+        Some(forkedRepository.name)
+      } else {
+        forkedRepository.repository.originRepositoryName.orElse {
+          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
        }
+      };
+      originRepository <- getRepository(originOwner, originRepositoryName, baseUrl)
+    ) yield {
+      using(
+        Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
+        Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
+      ){ case (oldGit, newGit) =>
+        val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
+        val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
+
+        pulls.html.mergecheck(
+          checkConflict(originRepository.owner, originRepository.name, originBranch,
+                        forkedRepository.owner, forkedRepository.name, forkedBranch))
      }
-      case _ => NotFound()
-    }
+    }) getOrElse NotFound
  })

  post("/:owner/:repository/pulls/new", pullRequestForm)(referrersOnly { (form, repository) =>
@@ -290,7 +315,7 @@ trait PullRequestsControllerBase extends ControllerBase {
      issueId               = issueId,
      originBranch          = form.targetBranch,
      requestUserName       = form.requestUserName,
-      requestRepositoryName = repository.name,
+      requestRepositoryName = form.requestRepositoryName,
      requestBranch         = form.requestBranch,
      commitIdFrom          = form.commitIdFrom,
      commitIdTo            = form.commitIdTo)
@@ -298,7 +323,7 @@ trait PullRequestsControllerBase extends ControllerBase {
    // fetch requested branch
    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
      git.fetch
-        .setRemote(getRepositoryDir(form.requestUserName, repository.name).toURI.toString)
+        .setRemote(getRepositoryDir(form.requestUserName, form.requestRepositoryName).toURI.toString)
        .setRefSpecs(new RefSpec(s"refs/heads/${form.requestBranch}:refs/pull/${issueId}/head"))
        .call
    }
@@ -323,12 +348,12 @@ trait PullRequestsControllerBase extends ControllerBase {
      using(Git.open(getRepositoryDir(requestUserName, requestRepositoryName))) { git =>
        val remoteRefName = s"refs/heads/${branch}"
        val tmpRefName = s"refs/merge-check/${userName}/${branch}"
-
-        withTmpRefSpec(new RefSpec(s"${remoteRefName}:${tmpRefName}").setForceUpdate(true), git) { ref =>
+        val refSpec = new RefSpec(s"${remoteRefName}:${tmpRefName}").setForceUpdate(true)
+        try {
          // fetch objects from origin repository branch
          git.fetch
             .setRemote(getRepositoryDir(userName, repositoryName).toURI.toString)
-             .setRefSpecs(ref)
+             .setRefSpecs(refSpec)
             .call

          // merge conflict check
@@ -340,6 +365,10 @@ trait PullRequestsControllerBase extends ControllerBase {
          } catch {
            case e: NoMergeBaseException =>  true
          }
+        } finally {
+          val refUpdate = git.getRepository.updateRef(refSpec.getDestination)
+          refUpdate.setForceUpdate(true)
+          refUpdate.delete()
        }
      }
    }
@@ -392,8 +421,7 @@ trait PullRequestsControllerBase extends ControllerBase {
  private def getForkedCommitId(oldGit: Git, newGit: Git, userName: String, repositoryName: String, branch: String,
      requestUserName: String, requestRepositoryName: String, requestBranch: String): String =
    JGitUtil.getCommitLogs(newGit, requestBranch, true){ commit =>
-      existsCommitId(userName, repositoryName, commit.getName) &&
-        JGitUtil.getBranchesOfCommit(oldGit, commit.getName).contains(branch)
+      existsCommitId(userName, repositoryName, commit.getName) && JGitUtil.getBranchesOfCommit(oldGit, commit.getName).contains(branch)
    }.head.id

  private def getRequestCompareInfo(userName: String, repositoryName: String, branch: String,
@@ -408,7 +436,7 @@ trait PullRequestsControllerBase extends ControllerBase {

      val commits = newGit.log.addRange(oldId, newId).call.iterator.asScala.map { revCommit =>
        new CommitInfo(revCommit)
-      }.toList.splitWith{ (commit1, commit2) =>
+      }.toList.splitWith { (commit1, commit2) =>
        view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
      }

--- a/src/main/scala/app/RepositorySettingsController.scala
+++ b/src/main/scala/app/RepositorySettingsController.scala
@@ -21,12 +21,13 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
    with OwnerAuthenticator with UsersAuthenticator =>

  // for repository options
-  case class OptionsForm(description: Option[String], defaultBranch: String, isPrivate: Boolean)
+  case class OptionsForm(repositoryName: String, description: Option[String], defaultBranch: String, isPrivate: Boolean)
  
  val optionsForm = mapping(
-    "description"   -> trim(label("Description"    , optional(text()))),
-    "defaultBranch" -> trim(label("Default Branch" , text(required, maxlength(100)))),
-    "isPrivate"     -> trim(label("Repository Type", boolean()))
+    "repositoryName" -> trim(label("Description"    , text(required, maxlength(40), identifier, renameRepositoryName))),
+    "description"    -> trim(label("Description"    , optional(text()))),
+    "defaultBranch"  -> trim(label("Default Branch" , text(required, maxlength(100)))),
+    "isPrivate"      -> trim(label("Repository Type", boolean()))
  )(OptionsForm.apply)

  // for collaborator addition
@@ -43,6 +44,13 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
    "url" -> trim(label("url", text(required, webHook)))
  )(WebHookForm.apply)

+  // for transfer ownership
+  case class TransferOwnerShipForm(newOwner: String)
+
+  val transferForm = mapping(
+    "newOwner" -> trim(label("New owner", text(required, transferUser)))
+  )(TransferOwnerShipForm.apply)
+
  /**
   * Redirect to the Options page.
   */
@@ -70,8 +78,21 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
        repository.repository.isPrivate
      } getOrElse form.isPrivate
    )
+    // Change repository name
+    if(repository.name != form.repositoryName){
+      // Update database
+      renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
+      // Move git repository
+      defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getRepositoryDir(repository.owner, form.repositoryName))
+      }
+      // Move wiki repository
+      defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
+      }
+    }
    flash += "info" -> "Repository settings has been updated."
-    redirect(s"/${repository.owner}/${repository.name}/settings/options")
+    redirect(s"/${repository.owner}/${form.repositoryName}/settings/options")
  })
  
  /**
@@ -138,17 +159,13 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
        .setMaxCount(3)
        .call.iterator.asScala.map(new CommitInfo(_))

-      val webHookURLs = getWebHookURLs(repository.owner, repository.name)
-      if(webHookURLs.nonEmpty){
-        val owner = getAccountByUserName(repository.owner).get
-        callWebHook(repository.owner, repository.name, webHookURLs,
-          WebHookPayload(
-            git,
-            owner,
-            "refs/heads/" + repository.repository.defaultBranch,
-            repository,
-            commits.toList,
-            owner))
+      getWebHookURLs(repository.owner, repository.name) match {
+        case webHookURLs if(webHookURLs.nonEmpty) =>
+          for(ownerAccount <- getAccountByUserName(repository.owner)){
+            callWebHook(repository.owner, repository.name, webHookURLs,
+              WebHookPayload(git, ownerAccount, "refs/heads/" + repository.repository.defaultBranch, repository, commits.toList, ownerAccount))
+          }
+        case _ =>
      }

      flash += "info" -> "Test payload deployed!"
@@ -157,10 +174,30 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
  })

  /**
-   * Display the delete repository page.
+   * Display the danger zone.
   */
-  get("/:owner/:repository/settings/delete")(ownerOnly {
-    settings.html.delete(_)
+  get("/:owner/:repository/settings/danger")(ownerOnly {
+    settings.html.danger(_)
+  })
+
+  /**
+   * Transfer repository ownership.
+   */
+  post("/:owner/:repository/settings/transfer", transferForm)(ownerOnly { (form, repository) =>
+    // Change repository owner
+    if(repository.owner != form.newOwner){
+      // Update database
+      renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
+      // Move git repository
+      defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getRepositoryDir(form.newOwner, repository.name))
+      }
+      // Move wiki repository
+      defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getWikiRepositoryDir(form.newOwner, repository.name))
+      }
+    }
+    redirect(s"/${form.newOwner}/${repository.name}")
  })

  /**
@@ -199,4 +236,32 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
      }
  }

+  /**
+   * Duplicate check for the rename repository name.
+   */
+  private def renameRepositoryName: Constraint = new Constraint(){
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+      params.get("repository").filter(_ != value).flatMap { _ =>
+        params.get("owner").flatMap { userName =>
+          getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
+        }
+      }
+  }
+
+  /**
+   * Provides Constraint to validate the repository transfer user.
+   */
+  private def transferUser: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      getAccountByUserName(value) match {
+        case None    => Some("User does not exist.")
+        case Some(x) => if(x.userName == params("owner")){
+          Some("This is current repository owner.")
+        } else {
+          params.get("repository").flatMap { repositoryName =>
+            getRepositoryNamesOfUser(x.userName).find(_ == repositoryName).map{ _ => "User already has same repository." }
+          }
+        }
+      }
+  }
 }
--- a/src/main/scala/app/RepositoryViewerController.scala
+++ b/src/main/scala/app/RepositoryViewerController.scala
@@ -175,7 +175,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      }
      workDir.mkdirs

-      val zipFile = new File(workDir, (if(revision.length == 40) revision.substring(0, 10) else revision) + ".zip")
+      val zipFile = new File(workDir, repository.name + "-" +
+        (if(revision.length == 40) revision.substring(0, 10) else revision) + ".zip")

      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
@@ -204,6 +205,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      }

      contentType = "application/octet-stream"
+      response.setHeader("Content-Disposition", s"attachment; filename=${zipFile.getName}")
      zipFile
    } else {
      BadRequest
--- a/src/main/scala/app/SignInController.scala
+++ b/src/main/scala/app/SignInController.scala
@@ -1,58 +0,0 @@
-package app
-
-import service._
-import jp.sf.amateras.scalatra.forms._
-import util.Implicits._
-import util.StringUtil._
-import util.Keys
-
-class SignInController extends SignInControllerBase with SystemSettingsService with AccountService
-
-trait SignInControllerBase extends ControllerBase { self: SystemSettingsService with AccountService =>
-  
-  case class SignInForm(userName: String, password: String)
-  
-  val form = mapping(
-    "userName" -> trim(label("Username", text(required))),
-    "password" -> trim(label("Password", text(required)))
-  )(SignInForm.apply)
-  
-  get("/signin"){
-    val redirect = params.get("redirect")
-    if(redirect.isDefined && redirect.get.startsWith("/")){
-      session.setAttribute(Keys.Session.Redirect, redirect.get)
-    }
-    html.signin(loadSystemSettings())
-  }
-
-  post("/signin", form){ form =>
-    authenticate(loadSystemSettings(), form.userName, form.password) match {
-      case Some(account) => signin(account)
-      case None          => redirect("/signin")
-    }
-  }
-
-  get("/signout"){
-    session.invalidate
-    redirect("/")
-  }
-
-  /**
-   * Set account information into HttpSession and redirect.
-   */
-  private def signin(account: model.Account) = {
-    session.setAttribute(Keys.Session.LoginAccount, account)
-    updateLastLoginDate(account.userName)
-
-    session.getAndRemove[String](Keys.Session.Redirect).map { redirectUrl =>
-      if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){
-        redirect("/")
-      } else {
-        redirect(redirectUrl)
-      }
-    }.getOrElse {
-      redirect("/")
-    }
-  }
-
-}
--- a/src/main/scala/app/SystemSettingsController.scala
+++ b/src/main/scala/app/SystemSettingsController.scala
@@ -33,6 +33,7 @@ trait SystemSettingsControllerBase extends ControllerBase with FlashMapSupport {
        "bindPassword"             -> trim(label("Bind Password", optional(text()))),
        "baseDN"                   -> trim(label("Base DN", text(required))),
        "userNameAttribute"        -> trim(label("User name attribute", text(required))),
+        "fullNameAttribute"        -> trim(label("Full name attribute", optional(text()))),
        "mailAttribute"            -> trim(label("Mail address attribute", text(required))),
        "tls"                      -> trim(label("Enable TLS", optional(boolean()))),
        "keystore"                 -> trim(label("Keystore", optional(text())))
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -188,16 +188,16 @@ trait WikiControllerBase extends ControllerBase with FlashMapSupport {

  private def conflictForNew: Constraint = new Constraint(){
    override def validate(name: String, value: String, messages: Messages): Option[String] = {
-      optionIf(targetWikiPage.nonEmpty){
-        Some("Someone has created the wiki since you started. Please reload this page and re-apply your changes.")
+      targetWikiPage.map { _ =>
+        "Someone has created the wiki since you started. Please reload this page and re-apply your changes."
      }
    }
  }

  private def conflictForEdit: Constraint = new Constraint(){
    override def validate(name: String, value: String, messages: Messages): Option[String] = {
-      optionIf(targetWikiPage.map(_.id != params("id")).getOrElse(false)){
-        Some("Someone has edited the wiki since you started. Please reload this page and re-apply your changes.")
+      targetWikiPage.filter(_.id != params("id")).map{ _ =>
+        "Someone has edited the wiki since you started. Please reload this page and re-apply your changes."
      }
    }
  }
--- a/src/main/scala/service/AccountService.scala
+++ b/src/main/scala/service/AccountService.scala
@@ -36,11 +36,15 @@ trait AccountService {
   */
  private def ldapAuthentication(settings: SystemSettings, userName: String, password: String) = {
    LDAPUtil.authenticate(settings.ldap.get, userName, password) match {
-      case Right(mailAddress) => {
+      case Right(ldapUserInfo) => {
        // Create or update account by LDAP information
-        getAccountByUserName(userName) match {
-          case Some(x) => updateAccount(x.copy(mailAddress = mailAddress))
-          case None    => createAccount(userName, "", userName, mailAddress, false, None)
+        getAccountByUserName(userName, true) match {
+          case Some(x) if(!x.isRemoved) => updateAccount(x.copy(mailAddress = ldapUserInfo.mailAddress, fullName = ldapUserInfo.fullName))
+          case Some(x) if(x.isRemoved)  => {
+            logger.info(s"LDAP Authentication Failed: Account is already registered but disabled..")
+            defaultAuthentication(userName, password)
+          }
+          case None => createAccount(userName, "", ldapUserInfo.fullName, ldapUserInfo.mailAddress, false, None)
        }
        getAccountByUserName(userName)
      }
--- a/src/main/scala/service/RepositoryService.scala
+++ b/src/main/scala/service/RepositoryService.scala
@@ -39,6 +39,67 @@ trait RepositoryService { self: AccountService =>
    IssueId insert (userName, repositoryName, 0)
  }

+  def renameRepository(oldUserName: String, oldRepositoryName: String, newUserName: String, newRepositoryName: String): Unit = {
+    (Query(Repositories) filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository =>
+      Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
+
+      val webHooks      = Query(WebHooks     ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val milestones    = Query(Milestones   ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val issueId       = Query(IssueId      ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val issues        = Query(Issues       ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val pullRequests  = Query(PullRequests ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val labels        = Query(Labels       ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val issueComments = Query(IssueComments).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val issueLabels   = Query(IssueLabels  ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val collaborators = Query(Collaborators).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val commitLog     = Query(CommitLog    ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val activities    = Query(Activities   ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+
+      Repositories.filter { t =>
+        (t.originUserName is oldUserName.bind) && (t.originRepositoryName is oldRepositoryName.bind)
+      }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName)
+
+      Repositories.filter { t =>
+        (t.parentUserName is oldUserName.bind) && (t.parentRepositoryName is oldRepositoryName.bind)
+      }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName)
+
+      PullRequests.filter { t =>
+        t.requestRepositoryName is oldRepositoryName.bind
+      }.map { t => t.requestUserName ~ t.requestRepositoryName }.update(newUserName, newRepositoryName)
+
+      deleteRepository(oldUserName, oldRepositoryName)
+
+      WebHooks      .insertAll(webHooks      .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      Milestones    .insertAll(milestones    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      IssueId       .insertAll(issueId       .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
+      Issues        .insertAll(issues        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      PullRequests  .insertAll(pullRequests  .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      IssueComments .insertAll(issueComments .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      Labels        .insertAll(labels        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      IssueLabels   .insertAll(issueLabels   .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      Collaborators .insertAll(collaborators .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      CommitLog     .insertAll(commitLog     .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
+      Activities    .insertAll(activities    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+
+      // Update activity messages
+      val updateActivities = Activities.filter { t =>
+        (t.message like s"%:${oldUserName}/${oldRepositoryName}]%") ||
+        (t.message like s"%:${oldUserName}/${oldRepositoryName}#%")
+      }.map { t => t.activityId ~ t.message }.list
+
+      updateActivities.foreach { case (activityId, message) =>
+        Activities.filter(_.activityId is activityId.bind).map(_.message).update(
+          message
+            .replace(s"[repo:${oldUserName}/${oldRepositoryName}]"   ,s"[repo:${newUserName}/${newRepositoryName}]")
+            .replace(s"[branch:${oldUserName}/${oldRepositoryName}#" ,s"[branch:${newUserName}/${newRepositoryName}#")
+            .replace(s"[tag:${oldUserName}/${oldRepositoryName}#"    ,s"[tag:${newUserName}/${newRepositoryName}#")
+            .replace(s"[pullreq:${oldUserName}/${oldRepositoryName}#",s"[pullreq:${newUserName}/${newRepositoryName}#")
+            .replace(s"[issue:${oldUserName}/${oldRepositoryName}#"  ,s"[issue:${newUserName}/${newRepositoryName}#")
+        )
+      }
+    }
+  }
+
  def deleteRepository(userName: String, repositoryName: String): Unit = {
    Activities    .filter(_.byRepository(userName, repositoryName)).delete
    CommitLog     .filter(_.byRepository(userName, repositoryName)).delete
@@ -207,11 +268,11 @@ trait RepositoryService { self: AccountService =>
    }.length).first


-  def getForkedRepositories(userName: String, repositoryName: String): List[String] =
+  def getForkedRepositories(userName: String, repositoryName: String): List[(String, String)] =
    Query(Repositories).filter { t =>
      (t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind)
    }
-    .sortBy(_.userName asc).map(_.userName).list
+    .sortBy(_.userName asc).map(t => t.userName ~ t.repositoryName).list

 }

--- a/src/main/scala/service/SystemSettingsService.scala
+++ b/src/main/scala/service/SystemSettingsService.scala
@@ -31,6 +31,7 @@ trait SystemSettingsService {
          ldap.bindPassword.foreach(x => props.setProperty(LdapBindPassword, x))
          props.setProperty(LdapBaseDN, ldap.baseDN)
          props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
+          ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x))
          props.setProperty(LdapMailAddressAttribute, ldap.mailAttribute)
          ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString))
          ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
@@ -71,6 +72,7 @@ trait SystemSettingsService {
            getOptionValue(props, LdapBindPassword, None),
            getValue(props, LdapBaseDN, ""),
            getValue(props, LdapUserNameAttribute, ""),
+            getOptionValue(props, LdapFullNameAttribute, None),
            getValue(props, LdapMailAddressAttribute, ""),
            getOptionValue[Boolean](props, LdapTls, None),
            getOptionValue(props, LdapKeystore, None)))
@@ -101,6 +103,7 @@ object SystemSettingsService {
    bindPassword: Option[String],
    baseDN: String,
    userNameAttribute: String,
+    fullNameAttribute: Option[String],
    mailAttribute: String,
    tls: Option[Boolean],
    keystore: Option[String])
@@ -134,6 +137,7 @@ object SystemSettingsService {
  private val LdapBindPassword = "ldap.bind_password"
  private val LdapBaseDN = "ldap.baseDN"
  private val LdapUserNameAttribute = "ldap.username_attribute"
+  private val LdapFullNameAttribute = "ldap.fullname_attribute"
  private val LdapMailAddressAttribute = "ldap.mail_attribute"
  private val LdapTls = "ldap.tls"
  private val LdapKeystore = "ldap.keystore"
--- a/src/main/scala/service/WikiService.scala
+++ b/src/main/scala/service/WikiService.scala
@@ -3,7 +3,7 @@ package service
 import java.util.Date
 import org.eclipse.jgit.api.Git
 import org.apache.commons.io.FileUtils
-import util.{PatchUtil, Directory, JGitUtil, LockUtil}
+import util._
 import _root_.util.ControlUtil._
 import org.eclipse.jgit.treewalk.{TreeWalk, CanonicalTreeParser}
 import org.eclipse.jgit.lib._
@@ -14,6 +14,7 @@ import java.io.ByteArrayInputStream
 import org.eclipse.jgit.patch._
 import org.eclipse.jgit.api.errors.PatchFormatException
 import scala.collection.JavaConverters._
+import scala.Some


 object WikiService {
@@ -59,11 +60,12 @@ trait WikiService {
   */
  def getWikiPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = {
    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      optionIf(!JGitUtil.isEmpty(git)){
+      if(!JGitUtil.isEmpty(git)){
        JGitUtil.getFileList(git, "master", ".").find(_.name == pageName + ".md").map { file =>
-          WikiPageInfo(file.name, new String(git.getRepository.open(file.id).getBytes, "UTF-8"), file.committer, file.time, file.commitId)
+          WikiPageInfo(file.name, StringUtil.convertFromByteArray(git.getRepository.open(file.id).getBytes),
+                       file.committer, file.time, file.commitId)
        }
-      }
+      } else None
    }
  }

@@ -72,7 +74,7 @@ trait WikiService {
   */
  def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] =
    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      optionIf(!JGitUtil.isEmpty(git)){
+      if(!JGitUtil.isEmpty(git)){
        val index = path.lastIndexOf('/')
        val parentPath = if(index < 0) "."  else path.substring(0, index)
        val fileName   = if(index < 0) path else path.substring(index + 1)
@@ -80,7 +82,7 @@ trait WikiService {
        JGitUtil.getFileList(git, "master", parentPath).find(_.name == fileName).map { file =>
          git.getRepository.open(file.id).getBytes
        }
-      }
+      } else None
    }

  /**
@@ -239,7 +241,7 @@ trait WikiService {
          }
        }

-        optionIf(created || updated || removed){
+        if(created || updated || removed){
          builder.add(JGitUtil.createDirCacheEntry(newPageName + ".md", FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8"))))
          builder.finish()
          val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer.fullName, committer.mailAddress,
@@ -256,7 +258,7 @@ trait WikiService {
            })

          Some(newHeadId)
-        }
+        } else None
      }
    }
  }
--- a/src/main/scala/servlet/AutoUpdateListener.scala
+++ b/src/main/scala/servlet/AutoUpdateListener.scala
@@ -50,6 +50,8 @@ object AutoUpdate {
   * The history of versions. A head of this sequence is the current BitBucket version.
   */
  val versions = Seq(
+    Version(1, 10),
+    Version(1, 9),
    Version(1, 8),
    Version(1, 7),
    Version(1, 6),
--- a/src/main/scala/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/servlet/GitRepositoryServlet.scala
@@ -56,10 +56,10 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
  
  override def create(request: HttpServletRequest, db: Repository): ReceivePack = {
    val receivePack = new ReceivePack(db)
-    val userName = request.getAttribute(Keys.Request.UserName).asInstanceOf[String]
+    val pusher = request.getAttribute(Keys.Request.UserName).asInstanceOf[String]

    logger.debug("requestURI: " + request.getRequestURI)
-    logger.debug("userName:" + userName)
+    logger.debug("pusher:" + pusher)

    defining(request.paths){ paths =>
      val owner      = paths(1)
@@ -69,7 +69,9 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
      logger.debug("repository:" + owner + "/" + repository)
      logger.debug("baseURL:" + baseURL)

-      receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, userName, baseURL))
+      if(!repository.endsWith(".wiki")){
+        receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, pusher, baseURL))
+      }
      receivePack
    }
  }
@@ -77,93 +79,100 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]

 import scala.collection.JavaConverters._

-class CommitLogHook(owner: String, repository: String, userName: String, baseURL: String) extends PostReceiveHook
+class CommitLogHook(owner: String, repository: String, pusher: String, baseURL: String) extends PostReceiveHook
  with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService {
  
  private val logger = LoggerFactory.getLogger(classOf[CommitLogHook])
  
  def onPostReceive(receivePack: ReceivePack, commands: java.util.Collection[ReceiveCommand]): Unit = {
-    using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
-      commands.asScala.foreach { command =>
-        logger.debug(s"commandType: ${command.getType}, refName: ${command.getRefName}")
-        val commits = command.getType match {
-          case ReceiveCommand.Type.DELETE => Nil
-          case _ => JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name)
-        }
-        val refName = command.getRefName.split("/")
-        val branchName = refName.drop(2).mkString("/")
+    try {
+      using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
+        commands.asScala.foreach { command =>
+          logger.debug(s"commandType: ${command.getType}, refName: ${command.getRefName}")
+          val commits = command.getType match {
+            case ReceiveCommand.Type.DELETE => Nil
+            case _ => JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name)
+          }
+          val refName = command.getRefName.split("/")
+          val branchName = refName.drop(2).mkString("/")

-        // Extract new commit and apply issue comment
-        val newCommits = if(commits.size > 1000){
-          val existIds = getAllCommitIds(owner, repository)
-          commits.flatMap { commit =>
-            optionIf(!existIds.contains(commit.id)){
-              createIssueComment(commit)
-              Some(commit)
+          // Extract new commit and apply issue comment
+          val newCommits = if(commits.size > 1000){
+            val existIds = getAllCommitIds(owner, repository)
+            commits.flatMap { commit =>
+              if(!existIds.contains(commit.id)){
+                createIssueComment(commit)
+                Some(commit)
+              } else None
+            }
+          } else {
+            commits.flatMap { commit =>
+              if(!existsCommitId(owner, repository, commit.id)){
+                createIssueComment(commit)
+                Some(commit)
+              } else None
            }
          }
-        } else {
-          commits.flatMap { commit =>
-            optionIf(!existsCommitId(owner, repository, commit.id)){
-              createIssueComment(commit)
-              Some(commit)
+
+          // batch insert all new commit id
+          insertAllCommitIds(owner, repository, newCommits.map(_.id))
+
+          // record activity
+          if(refName(1) == "heads"){
+            command.getType match {
+              case ReceiveCommand.Type.CREATE => recordCreateBranchActivity(owner, repository, pusher, branchName)
+              case ReceiveCommand.Type.UPDATE => recordPushActivity(owner, repository, pusher, branchName, newCommits)
+              case ReceiveCommand.Type.DELETE => recordDeleteBranchActivity(owner, repository, pusher, branchName)
+              case _ =>
+            }
+          } else if(refName(1) == "tags"){
+            command.getType match {
+              case ReceiveCommand.Type.CREATE => recordCreateTagActivity(owner, repository, pusher, branchName, newCommits)
+              case ReceiveCommand.Type.DELETE => recordDeleteTagActivity(owner, repository, pusher, branchName, newCommits)
+              case _ =>
            }
          }
-        }

-        // batch insert all new commit id
-        insertAllCommitIds(owner, repository, newCommits.map(_.id))
+          if(refName(1) == "heads"){
+            command.getType match {
+              case ReceiveCommand.Type.CREATE |
+                   ReceiveCommand.Type.UPDATE |
+                   ReceiveCommand.Type.UPDATE_NONFASTFORWARD =>
+                updatePullRequests(branchName)
+              case _ =>
+            }
+          }

-        // record activity
-        if(refName(1) == "heads"){
-          command.getType match {
-            case ReceiveCommand.Type.CREATE => recordCreateBranchActivity(owner, repository, userName, branchName)
-            case ReceiveCommand.Type.UPDATE => recordPushActivity(owner, repository, userName, branchName, newCommits)
-            case ReceiveCommand.Type.DELETE => recordDeleteBranchActivity(owner, repository, userName, branchName)
+          // call web hook
+          getWebHookURLs(owner, repository) match {
+            case webHookURLs if(webHookURLs.nonEmpty) =>
+              for(pusherAccount <- getAccountByUserName(pusher);
+                  ownerAccount   <- getAccountByUserName(owner);
+                  repositoryInfo <- getRepository(owner, repository, baseURL)){
+                callWebHook(owner, repository, webHookURLs,
+                  WebHookPayload(git, pusherAccount, command.getRefName, repositoryInfo, newCommits, ownerAccount))
+              }
            case _ =>
          }
-        } else if(refName(1) == "tags"){
-          command.getType match {
-            case ReceiveCommand.Type.CREATE => recordCreateTagActivity(owner, repository, userName, branchName, newCommits)
-            case ReceiveCommand.Type.DELETE => recordDeleteTagActivity(owner, repository, userName, branchName, newCommits)
-            case _ =>
-          }
-        }
-
-        if(refName(1) == "heads"){
-          command.getType match {
-            case ReceiveCommand.Type.CREATE |
-                 ReceiveCommand.Type.UPDATE |
-                 ReceiveCommand.Type.UPDATE_NONFASTFORWARD =>
-              updatePullRequests(branchName)
-            case _ =>
-          }
-        }
-
-        // call web hook
-        val webHookURLs = getWebHookURLs(owner, repository)
-        if(webHookURLs.nonEmpty){
-          val payload = WebHookPayload(
-            git,
-            getAccountByUserName(userName).get,
-            command.getRefName,
-            getRepository(owner, repository, baseURL).get,
-            newCommits,
-            getAccountByUserName(owner).get)
-
-          callWebHook(owner, repository, webHookURLs, payload)
        }
      }
+      // update repository last modified time.
+      updateLastActivityDate(owner, repository)
+    } catch {
+      case ex: Exception => {
+        logger.error(ex.toString, ex)
+        throw ex
+      }
    }
-    // update repository last modified time.
-    updateLastActivityDate(owner, repository)
  }

  private def createIssueComment(commit: CommitInfo) = {
    "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(commit.fullMessage).matchData.foreach { matchData =>
      val issueId = matchData.group(2)
-      if(getAccountByUserName(commit.committer).isDefined && getIssue(owner, repository, issueId).isDefined){
-        createComment(owner, repository, commit.committer, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
+      if(getIssue(owner, repository, issueId).isDefined){
+        getAccountByMailAddress(commit.mailAddress).foreach { account =>
+          createComment(owner, repository, account.userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
+        }
      }
    }
  }
--- a/src/main/scala/util/ControlUtil.scala
+++ b/src/main/scala/util/ControlUtil.scala
@@ -4,6 +4,7 @@ import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.revwalk.RevWalk
 import org.eclipse.jgit.treewalk.TreeWalk
 import org.eclipse.jgit.transport.RefSpec
+import scala.language.reflectiveCalls

 /**
 * Provides control facilities.
@@ -24,12 +25,12 @@ object ControlUtil {
    }

  def using[T](git: Git)(f: Git => T): T =
-    try f(git) finally git.getRepository.close
+    try f(git) finally git.getRepository.close()

  def using[T](git1: Git, git2: Git)(f: (Git, Git) => T): T =
    try f(git1, git2) finally {
-      git1.getRepository.close
-      git2.getRepository.close
+      git1.getRepository.close()
+      git2.getRepository.close()
    }

  def using[T](revWalk: RevWalk)(f: RevWalk => T): T =
@@ -39,22 +40,14 @@ object ControlUtil {
    try f(treeWalk) finally treeWalk.release()


-  def withTmpRefSpec[T](ref: RefSpec, git: Git)(f: RefSpec => T): T = {
-    try {
-      f(ref)
-    } finally {
-      val refUpdate = git.getRepository.updateRef(ref.getDestination)
-      refUpdate.setForceUpdate(true)
-      refUpdate.delete()
-    }
-  }
+//  def withTmpRefSpec[T](ref: RefSpec, git: Git)(f: RefSpec => T): T = {
+//    try {
+//      f(ref)
+//    } finally {
+//      val refUpdate = git.getRepository.updateRef(ref.getDestination)
+//      refUpdate.setForceUpdate(true)
+//      refUpdate.delete()
+//    }
+//  }

-  def executeIf(condition: => Boolean)(action: => Unit): Boolean =
-    if(condition){
-      action
-      true
-    } else false
-
-  def optionIf[T](condition: => Boolean)(action: => Option[T]): Option[T] =
-    if(condition) action else None
 }
--- a/src/main/scala/util/Directory.scala
+++ b/src/main/scala/util/Directory.scala
@@ -2,6 +2,7 @@ package util

 import java.io.File
 import util.ControlUtil._
+import org.apache.commons.io.FileUtils

 /**
 * Provides directories used by GitBucket.
@@ -14,8 +15,16 @@ object Directory {
    case _ => scala.util.Properties.envOrNone("GITBUCKET_HOME") match {
      // environment variable GITBUCKET_HOME
      case Some(env) => new File(env)
-      // default is HOME/gitbucket
-      case None => new File(System.getProperty("user.home"), "gitbucket")
+      // default is HOME/.gitbucket
+      case None => {
+        val oldHome = new File(System.getProperty("user.home"), "gitbucket")
+        if(oldHome.exists && oldHome.isDirectory && new File(oldHome, "version").exists){
+          //FileUtils.moveDirectory(oldHome, newHome)
+          oldHome
+        } else {
+          new File(System.getProperty("user.home"), ".gitbucket")
+        }
+      }
    }
  }).getAbsolutePath

--- a/src/main/scala/util/FileUtil.scala
+++ b/src/main/scala/util/FileUtil.scala
@@ -63,9 +63,9 @@ object FileUtil {
    if(dir.exists()){
      FileUtils.deleteDirectory(dir)
    }
-    try{
+    try {
      action(dir)
-    }finally{
+    } finally {
      FileUtils.deleteDirectory(dir)
    }
  }
--- a/src/main/scala/util/JGitUtil.scala
+++ b/src/main/scala/util/JGitUtil.scala
@@ -79,9 +79,9 @@ object JGitUtil {
    }

    val description = defining(fullMessage.trim.indexOf("\n")){ i =>
-      optionIf(i >= 0){
+      if(i >= 0){
        Some(fullMessage.trim.substring(i).trim)
-      }
+      } else None
    }
  }

--- a/src/main/scala/util/LDAPUtil.scala
+++ b/src/main/scala/util/LDAPUtil.scala
@@ -18,51 +18,49 @@ object LDAPUtil {

  /**
   * Try authentication by LDAP using given configuration.
-   * Returns Right(mailAddress) if authentication is successful, otherwise  Left(errorMessage).
+   * Returns Right(LDAPUserInfo) if authentication is successful, otherwise  Left(errorMessage).
   */
-  def authenticate(ldapSettings: Ldap, userName: String, password: String): Either[String, String] = {
+  def authenticate(ldapSettings: Ldap, userName: String, password: String): Either[String, LDAPUserInfo] = {
    bind(
-      ldapSettings.host,
-      ldapSettings.port.getOrElse(SystemSettingsService.DefaultLdapPort),
-      ldapSettings.bindDN.getOrElse(""),
-      ldapSettings.bindPassword.getOrElse(""),
-      ldapSettings.tls.getOrElse(false),
-      ldapSettings.keystore.getOrElse("")
-    ) match {
-      case Some(conn) => {
-        withConnection(conn) { conn =>
-          findUser(conn, userName, ldapSettings.baseDN, ldapSettings.userNameAttribute) match {
-            case Some(userDN) => userAuthentication(ldapSettings, userDN, password)
-            case None => Left("User does not exist.")
-          }
-        }
+      host     = ldapSettings.host,
+      port     = ldapSettings.port.getOrElse(SystemSettingsService.DefaultLdapPort),
+      dn       = ldapSettings.bindDN.getOrElse(""),
+      password = ldapSettings.bindPassword.getOrElse(""),
+      tls      = ldapSettings.tls.getOrElse(false),
+      keystore = ldapSettings.keystore.getOrElse(""),
+      error    = "System LDAP authentication failed."
+    ){ conn =>
+      findUser(conn, userName, ldapSettings.baseDN, ldapSettings.userNameAttribute) match {
+        case Some(userDN) => userAuthentication(ldapSettings, userDN, userName, password)
+        case None         => Left("User does not exist.")
      }
-      case None => Left("System LDAP authentication failed.")
    }
  }

-  private def userAuthentication(ldapSettings: Ldap, userDN: String, password: String): Either[String, String] = {
+  private def userAuthentication(ldapSettings: Ldap, userDN: String, userName: String, password: String): Either[String, LDAPUserInfo] = {
    bind(
-      ldapSettings.host,
-      ldapSettings.port.getOrElse(SystemSettingsService.DefaultLdapPort),
-      userDN,
-      password,
-      ldapSettings.tls.getOrElse(false),
-      ldapSettings.keystore.getOrElse("")
-    ) match {
-      case Some(conn) => {
-        withConnection(conn) { conn =>
-          findMailAddress(conn, userDN, ldapSettings.mailAttribute) match {
-            case Some(mailAddress) => Right(mailAddress)
-            case None => Left("Can't find mail address.")
-          }
-        }
+      host     = ldapSettings.host,
+      port     = ldapSettings.port.getOrElse(SystemSettingsService.DefaultLdapPort),
+      dn       = userDN,
+      password = password,
+      tls      = ldapSettings.tls.getOrElse(false),
+      keystore = ldapSettings.keystore.getOrElse(""),
+      error    = "User LDAP Authentication Failed."
+    ){ conn =>
+      findMailAddress(conn, userDN, ldapSettings.mailAttribute) match {
+        case Some(mailAddress) => Right(LDAPUserInfo(
+          userName    = userName,
+          fullName    = ldapSettings.fullNameAttribute.flatMap { fullNameAttribute =>
+            findFullName(conn, userDN, fullNameAttribute)
+          }.getOrElse(userName),
+          mailAddress = mailAddress))
+        case None => Left("Can't find mail address.")
      }
-      case None => Left("User LDAP Authentication Failed.")
    }
  }

-  private def bind(host: String, port: Int, dn: String, password: String, tls: Boolean, keystore: String): Option[LDAPConnection] = {
+  private def bind[A](host: String, port: Int, dn: String, password: String, tls: Boolean, keystore: String, error: String)
+                  (f: LDAPConnection => Either[String, A]): Either[String, A] = {
    if (tls) {
      // Dynamically set Sun as the security provider
      Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider())
@@ -87,7 +85,9 @@ object LDAPUtil {
      // Bind to the server
      conn.bind(LDAP_VERSION, dn, password.getBytes)

-      Some(conn)
+      // Execute a given function and returns a its result
+      f(conn)
+
    } catch {
      case e: Exception => {
        // Provide more information if something goes wrong
@@ -96,20 +96,15 @@ object LDAPUtil {
        if (conn.isConnected) {
          conn.disconnect()
        }
-
-        None
+        // Returns an error message
+        Left(error)
      }
    }
  }

-  private def withConnection[T](conn: LDAPConnection)(f: LDAPConnection => T): T = {
-    try {
-      f(conn)
-    } finally {
-      conn.disconnect()
-    }
-  }
-
+  /**
+   * Search a specified user and returns userDN if exists.
+   */
  private def findUser(conn: LDAPConnection, userName: String, baseDN: String, userNameAttribute: String): Option[String] = {
    @tailrec
    def getEntries(results: LDAPSearchResults, entries: List[Option[LDAPEntry]] = Nil): List[LDAPEntry] = {
@@ -130,8 +125,18 @@ object LDAPUtil {

  private def findMailAddress(conn: LDAPConnection, userDN: String, mailAttribute: String): Option[String] =
    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, null, Array[String](mailAttribute), false)){ results =>
-      optionIf (results.hasMore) {
+      if(results.hasMore) {
        Option(results.next.getAttribute(mailAttribute)).map(_.getStringValue)
-      }
+      } else None
    }
+
+  private def findFullName(conn: LDAPConnection, userDN: String, nameAttribute: String): Option[String] =
+    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, null, Array[String](nameAttribute), false)){ results =>
+      if(results.hasMore) {
+        Option(results.next.getAttribute(nameAttribute)).map(_.getStringValue)
+      } else None
+    }
+
+  case class LDAPUserInfo(userName: String, fullName: String, mailAddress: String)
+
 }
--- a/src/main/scala/util/StringUtil.scala
+++ b/src/main/scala/util/StringUtil.scala
@@ -3,6 +3,8 @@ package util
 import java.net.{URLDecoder, URLEncoder}
 import org.mozilla.universalchardet.UniversalDetector
 import util.ControlUtil._
+import org.apache.commons.io.input.BOMInputStream
+import org.apache.commons.io.IOUtils

 object StringUtil {

@@ -27,7 +29,12 @@ object StringUtil {
  def escapeHtml(value: String): String =
    value.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;")

-  def convertFromByteArray(content: Array[Byte]): String = new String(content, detectEncoding(content))
+  /**
+   * Make string from byte array. Character encoding is detected automatically by [[util.StringUtil.detectEncoding]].
+   * And if given bytes contains UTF-8 BOM, it's removed from returned string..
+   */
+  def convertFromByteArray(content: Array[Byte]): String =
+    IOUtils.toString(new BOMInputStream(new java.io.ByteArrayInputStream(content)), detectEncoding(content))

  def detectEncoding(content: Array[Byte]): String =
    defining(new UniversalDetector(null)){ detector =>
--- a/src/main/twirl/admin/system.scala.html
+++ b/src/main/twirl/admin/system.scala.html
@@ -1,5 +1,6 @@
@(settings: service.SystemSettingsService.SystemSettings, info: Option[Any])(implicit context: app.Context)
@import context._
+@import util.Directory._
@import view.helpers._
@html.main("System Settings"){
  @menu("system"){
@@ -8,9 +9,15 @@
      <div class="box">
        <div class="box-header">System Settings</div>
        <div class="box-content">
+          <!--====================================================================-->
+          <!-- GITBUCKET_HOME -->
+          <!--====================================================================-->
+          <label class="strong">GITBUCKET_HOME</label>
+          @GitBucketHome
          <!--====================================================================-->
          <!-- Account registration -->
          <!--====================================================================-->
+          <hr>
          <label class="strong">Account registration</label>
          <fieldset>
            <label class="radio">
@@ -87,6 +94,13 @@
                <span id="error-ldap_userNameAttribute" class="error"></span>
              </div>
            </div>
+            <div class="control-group">
+              <label class="control-label" for="ldapFullNameAttribute">Full name attribute</label>
+              <div class="controls">
+                <input type="text" id="ldapFullNameAttribute" name="ldap.fullNameAttribute" value="@settings.ldap.map(_.fullNameAttribute)"/>
+                <span id="error-ldap_fullNameAttribute" class="error"></span>
+              </div>
+            </div>
            <div class="control-group">
              <label class="control-label" for="ldapMailAttribute">Mail address attribute</label>
              <div class="controls">
--- a/src/main/twirl/issues/commentlist.scala.html
+++ b/src/main/twirl/issues/commentlist.scala.html
@@ -36,11 +36,11 @@
    <div class="small" style="margin-top: 10px; margin-bottom: 10px;">
      <span class="label label-info">Merged</span>
      @avatar(comment.commentedUserName, 20)
-      @user(comment.commentedUserName, styleClass="username strong") merged commit <code>@pullreq.map(_.commitIdTo.substring(0, 7))</code>
+      @user(comment.commentedUserName, styleClass="username strong") merged commit <code>@pullreq.map(_.commitIdTo.substring(0, 7))</code> into
      @if(pullreq.get.requestUserName == repository.owner){
-        <span class="label label-info monospace">@pullreq.map(_.requestBranch)</span> to <span class="label label-info monospace">@pullreq.map(_.branch)</span>
+        <span class="label label-info monospace">@pullreq.map(_.branch)</span> from <span class="label label-info monospace">@pullreq.map(_.requestBranch)</span>
      } else {
-        <span class="label label-info monospace">@pullreq.map(_.requestUserName):@pullreq.map(_.requestBranch)</span> to <span class="label label-info monospace">@pullreq.map(_.userName):@pullreq.map(_.branch)</span>
+        <span class="label label-info monospace">@pullreq.map(_.userName):@pullreq.map(_.branch)</span> to <span class="label label-info monospace">@pullreq.map(_.requestUserName):@pullreq.map(_.requestBranch)</span>
      }
      @datetime(comment.registeredDate)
    </div>
--- a/src/main/twirl/issues/editcomment.scala.html
+++ b/src/main/twirl/issues/editcomment.scala.html
@@ -2,15 +2,17 @@
@import context._
 <span id="error-edit-content-@commentId" class="error"></span>
 <textarea style="width: 680px; height: 100px;" id="edit-content-@commentId">@content</textarea>
-<input type="button" class="btn btn-small" value="Update Comment"/>
-<span class="pull-right"><a class="btn btn-small btn-danger" href="#">Cancel</a></span>
+<div>
+  <input type="button" id="update-comment-@commentId" class="btn btn-small" value="Update Comment"/>
+  <input type="button" id="cancel-comment-@commentId" class="btn btn-small btn-danger pull-right" value="Cancel"/>
+</div>
 <script>
 $(function(){
  var callback = function(data){
    $('#commentContent-@commentId').empty().html(data.content);
  };

-  $('#commentContent-@commentId input.btn').click(function(){
+  $('#update-comment-@commentId').click(function(){
    $.ajax({
      url: '@path/@owner/@repository/issue_comments/edit/@commentId',
      type: 'POST',
@@ -25,7 +27,7 @@ $(function(){
    });
  });

-  $('#commentContent-@commentId a.btn').click(function(){
+  $('#cancel-comment-@commentId').click(function(){
    $.get('@path/@owner/@repository/issue_comments/_data/@commentId', callback);
    return false;
  });
--- a/src/main/twirl/issues/editissue.scala.html
+++ b/src/main/twirl/issues/editissue.scala.html
@@ -3,8 +3,10 @@
 <span id="error-edit-title" class="error"></span>
 <input type="text" style="width: 680px;" id="edit-title" value="@title"/>
 <textarea style="width: 680px; height: 100px; max-height: 300px;" id="edit-content">@content.getOrElse("")</textarea>
-<input type="button" class="btn btn-small" value="Update Issue"/>
-<span class="pull-right"><a class="btn btn-small btn-danger" href="#">Cancel</a></span>
+<div>
+  <input type="button" id="update" class="btn btn-small" value="Update Issue"/>
+  <input type="button" id="cancel" class="btn btn-small btn-danger pull-right" value="Cancel"/>
+</div>
 <script>
 $(function(){
  $('#edit-content').elastic();
@@ -14,7 +16,7 @@ $(function(){
    $('#issueContent').empty().html(data.content);
  };

-  $('#issueContent input.btn').click(function(){
+  $('#update').click(function(){
    $.ajax({
      url: '@path/@owner/@repository/issues/edit/@issueId',
      type: 'POST',
@@ -29,7 +31,7 @@ $(function(){
    });
  });

-  $('#issueContent a.btn').click(function(){
+  $('#cancel').click(function(){
    $.get('@path/@owner/@repository/issues/_data/@issueId', callback);
    return false;
  });
--- a/src/main/twirl/pulls/compare.scala.html
+++ b/src/main/twirl/pulls/compare.scala.html
@@ -1,6 +1,6 @@
@(commits: Seq[Seq[util.JGitUtil.CommitInfo]],
  diffs: Seq[util.JGitUtil.DiffInfo],
-  members: List[String],
+  members: List[(String, String)],
  originId: String,
  forkedId: String,
  sourceId: String,
@@ -20,25 +20,25 @@
    </div>
    <div id="compare-edit" style="display: none;">
      <a href="#" id="cancel-condition-editing" class="pull-right"><i class="icon-remove-circle"></i></a>
-      @helper.html.dropdown(originRepository.owner + "/" + repository.name, "base fork") {
-        @members.map { member =>
-          <li><a href="#" class="origin-owner" data-name="@member">@helper.html.checkicon(member == originRepository.owner) @member/@repository.name</a></li>
+      @helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork") {
+        @members.map { case (owner, name) =>
+          <li><a href="#" class="origin-owner" data-owner="@owner" data-name="@name">@helper.html.checkicon(owner == originRepository.owner) @owner/@name</a></li>
        }
      }
      @helper.html.dropdown(originId, "base") {
        @originRepository.branchList.map { branch =>
-          <li><a href="#" class="origin-branch" data-name="@encodeRefName(branch)">@helper.html.checkicon(branch == originId) @branch</a></li>
+          <li><a href="#" class="origin-branch" data-branch="@encodeRefName(branch)">@helper.html.checkicon(branch == originId) @branch</a></li>
        }
      }
      ...
-      @helper.html.dropdown(forkedRepository.owner + "/" + repository.name, "head fork") {
-        @members.map { member =>
-          <li><a href="#" class="forked-owner" data-name="@member">@helper.html.checkicon(member == forkedRepository.owner) @member/@repository.name</a></li>
+      @helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork") {
+        @members.map { case (owner, name) =>
+          <li><a href="#" class="forked-owner" data-owner="@owner" data-name="@name">@helper.html.checkicon(owner == forkedRepository.owner) @owner/@name</a></li>
        }
      }
      @helper.html.dropdown(forkedId, "compare") {
        @forkedRepository.branchList.map { branch =>
-          <li><a href="#" class="forked-branch" data-name="@encodeRefName(branch)">@helper.html.checkicon(branch == forkedId) @branch</a></li>
+          <li><a href="#" class="forked-branch" data-branch="@encodeRefName(branch)">@helper.html.checkicon(branch == forkedId) @branch</a></li>
        }
      }
    </div>
@@ -49,7 +49,7 @@
    </div>
    <div id="pull-request-form" class="box" style="display: none;">
        <div class="box-content">
-          <form method="POST" action="@path/@originRepository.owner/@repository.name/pulls/new" validate="true">
+          <form method="POST" action="@path/@originRepository.owner/@originRepository.name/pulls/new" validate="true">
            <div style="width: 260px; position: absolute; margin-left: 635px;">
              <div class="check-conflict" style="display: none;">
                <img src="@assets/common/images/indicator.gif"/> Checking...
@@ -62,6 +62,7 @@
              <input type="hidden" name="targetUserName" value="@originRepository.owner"/>
              <input type="hidden" name="targetBranch" value="@originId"/>
              <input type="hidden" name="requestUserName" value="@forkedRepository.owner"/>
+              <input type="hidden" name="requestRepositoryName" value="@forkedRepository.name"/>
              <input type="hidden" name="requestBranch" value="@forkedId"/>
              <input type="hidden" name="commitIdFrom" value="@sourceId"/>
              <input type="hidden" name="commitIdTo" value="@commitId"/>
@@ -104,14 +105,16 @@ $(function(){

    @if(members.isEmpty){
      location.href = '@url(repository)/compare/' +
-        $.trim($('i.icon-ok').parents('a.origin-branch').data('name')) + '...' +
-        $.trim($('i.icon-ok').parents('a.forked-branch').data('name'));
+        $.trim($('i.icon-ok').parents('a.origin-branch').data('branch')) + '...' +
+        $.trim($('i.icon-ok').parents('a.forked-branch').data('branch'));
    } else {
-      location.href = '@url(repository)/compare/' +
-        $.trim($('i.icon-ok').parents('a.origin-owner' ).data('name')) + ':' +
-        $.trim($('i.icon-ok').parents('a.origin-branch').data('name')) + '...' +
-        $.trim($('i.icon-ok').parents('a.forked-owner' ).data('name')) + ':' +
-        $.trim($('i.icon-ok').parents('a.forked-branch').data('name'));
+      location.href = '@path/' +
+        $.trim($('i.icon-ok').parents('a.forked-owner' ).data('owner')) + '/' +
+        $.trim($('i.icon-ok').parents('a.forked-owner' ).data('name')) +'/compare/' +
+        $.trim($('i.icon-ok').parents('a.origin-owner' ).data('owner')) + ':' +
+        $.trim($('i.icon-ok').parents('a.origin-branch').data('branch')) + '...' +
+        $.trim($('i.icon-ok').parents('a.forked-owner' ).data('owner')) + ':' +
+        $.trim($('i.icon-ok').parents('a.forked-branch').data('branch'));
    }
  });

@@ -129,15 +132,15 @@ $(function(){

    @if(members.isEmpty){
      checkConflict(
-        $.trim($('i.icon-ok').parents('a.origin-branch').data('name')),
-        $.trim($('i.icon-ok').parents('a.forked-branch').data('name'))
+        $.trim($('i.icon-ok').parents('a.origin-branch').data('branch')),
+        $.trim($('i.icon-ok').parents('a.forked-branch').data('branch'))
      );
    } else {
      checkConflict(
-        $.trim($('i.icon-ok').parents('a.origin-owner' ).data('name')) + ":" +
-        $.trim($('i.icon-ok').parents('a.origin-branch').data('name')),
-        $.trim($('i.icon-ok').parents('a.forked-owner' ).data('name')) + ":" +
-        $.trim($('i.icon-ok').parents('a.forked-branch').data('name'))
+        $.trim($('i.icon-ok').parents('a.origin-owner' ).data('owner')) + ":" +
+        $.trim($('i.icon-ok').parents('a.origin-branch').data('branch')),
+        $.trim($('i.icon-ok').parents('a.forked-owner' ).data('owner')) + ":" +
+        $.trim($('i.icon-ok').parents('a.forked-branch').data('branch'))
      );
    }
  }
--- a/src/main/twirl/pulls/pullreq.scala.html
+++ b/src/main/twirl/pulls/pullreq.scala.html
@@ -17,17 +17,17 @@
        @comments.find(_.action == "merge").map{ comment =>
          <span class="label label-info">Merged</span>
          @user(comment.commentedUserName, styleClass="username strong") merged @commits.size @plural(commits.size, "commit")
-          into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</code>
+          into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
          at @datetime(comment.registeredDate)
        }.getOrElse {
          <span class="label label-important">Closed</span>
          @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
-          into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</code>
+          into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
        }
      } else {
        <span class="label label-success">Open</span>
        @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
-        into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</code>
+        into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
      }
    </div>
    <ul class="nav nav-tabs" id="pullreq-tab">
--- a/src/main/twirl/repo/files.scala.html
+++ b/src/main/twirl/repo/files.scala.html
@@ -80,7 +80,7 @@
  @readme.map { content =>
  <div id="readme" class="box">
    <div class="box-header">README.md</div>
-    <div class="box-content">@markdown(content, repository, false, false)</div>
+    <div class="box-content markdown-body">@markdown(content, repository, false, false)</div>
  </div>
  }
 }
--- a/src/main/twirl/repo/forked.scala.html
+++ b/src/main/twirl/repo/forked.scala.html
@@ -1,5 +1,5 @@
@(originRepository: Option[service.RepositoryService.RepositoryInfo],
-  members: List[String],
+  members: List[(String, String)],
  repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
@import context._
@import view.helpers._
@@ -23,11 +23,11 @@
    }
    (origin)
  </div>
-  @members.map { owner =>
+  @members.map { case (owner, name) =>
    <div class="block">
      @avatar(owner, 20)
      <span@if(repository.owner == owner){ class="highlight"}>
-        <a href="@url(owner)">@owner</a> / <a href="@path/@owner/@repository.name">@repository.name</a>
+        <a href="@url(owner)">@owner</a> / <a href="@path/@owner/@name">@name</a>
      </span>
    </div>
  }
--- a/src/main/twirl/settings/collaborators.scala.html
+++ b/src/main/twirl/settings/collaborators.scala.html
@@ -18,7 +18,7 @@
      }
    </ul>
    @if(!isGroupRepository){
-      <form method="POST" action="@url(repository)/settings/collaborators/add" validate="true">
+      <form method="POST" action="@url(repository)/settings/collaborators/add" validate="true" autocomplete="off">
        <div>
          <span class="error" id="error-userName"></span>
        </div>
--- a/src/main/twirl/settings/danger.scala.html
+++ b/src/main/twirl/settings/danger.scala.html
@@ -0,0 +1,44 @@
+@(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("Danger Zone", Some(repository)){
+  @html.header("settings", repository)
+  @menu("danger", repository){
+    <div class="box">
+      <div class="box-header">Danger Zone</div>
+      <div class="box-content">
+        <form id="transfer-form" method="post" action="@url(repository)/settings/transfer" validate="true" autocomplete="off">
+          <fieldset>
+            <label class="strong">Transfer Ownership</label>
+            <div>
+              Transfer this repo to another user or to group.
+              <div class="pull-right">
+                @helper.html.account("newOwner", 150)
+                <input type="submit" class="btn btn-danger" value="Transfer"/>
+                <div>
+                  <span id="error-newOwner" class="error"></span>
+                </div>
+              </div>
+            </div>
+          </fieldset>
+        </form>
+        <form id="delete-form" method="post" action="@url(repository)/settings/delete">
+          <fieldset class="margin">
+            <label class="strong">Delete repository</label>
+            <div>
+              Once you delete a repository, there is no going back.
+              <input type="submit" class="btn btn-danger pull-right" value="Delete this repository"/>
+            </div>
+          </fieldset>
+        </form>
+      </div>
+    </div>
+  }
+}
+<script>
+$(function(){
+  $('#delete-form').submit(function(){
+    return confirm('Once you delete a repository, there is no going back.\nAre you sure?');
+  });
+});
+</script>
--- a/src/main/twirl/settings/delete.scala.html
+++ b/src/main/twirl/settings/delete.scala.html
@@ -1,22 +0,0 @@
-@(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@html.main("Delete Repository", Some(repository)){
-  @html.header("settings", repository)
-  @menu("delete", repository){
-    <form id="form" method="post" action="@url(repository)/settings/delete">
-      <h3>Delete repository</h3>
-      <p>
-        Once you delete a repository, there is no going back.
-      </p>
-      <input type="submit" class="btn btn-danger" value="Delete this repository"/>
-    </form>
-  }
-}
-<script>
-$(function(){
-  $('#form').submit(function(){
-    return confirm('Once you delete a repository, there is no going back.\nAre you sure?');
-  });
-});
-</script>
--- a/src/main/twirl/settings/menu.scala.html
+++ b/src/main/twirl/settings/menu.scala.html
@@ -14,8 +14,8 @@
        <li@if(active=="hooks"){ class="active"}>
          <a href="@url(repository)/settings/hooks">Service Hooks</a>
        </li>
-        <li@if(active=="delete"){ class="active"}>
-          <a href="@url(repository)/settings/delete">Delete Repository</a>
+        <li@if(active=="danger"){ class="active"}>
+          <a href="@url(repository)/settings/danger">Danger Zone</a>
        </li>
      </ul>
    </div>
--- a/src/main/twirl/settings/options.scala.html
+++ b/src/main/twirl/settings/options.scala.html
@@ -10,6 +10,11 @@
        <div class="box-header">Settings</div>
        <div class="box-content">
          <fieldset>
+            <label for="repositoryName" class="strong">Repository Name:</label>
+            <input type="text" name="repositoryName" id="repositoryName" value="@repository.name"/>
+            <span id="error-repositoryName" class="error"></span>
+          </fieldset>
+          <fieldset class="margin">
            <label for="description" class="strong">Description:</label>
            <input type="text" name="description" id="description" style="width: 600px;" value="@repository.repository.description"/>
          </fieldset>
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -11,6 +11,13 @@
    <listener-class>servlet.SessionCleanupListener</listener-class>
  </listener>

+  <!-- ===================================================================== -->
+  <!-- Automatic migration -->
+  <!-- ===================================================================== -->
+  <listener>
+    <listener-class>servlet.AutoUpdateListener</listener-class>
+  </listener>
+
  <!-- ===================================================================== -->
  <!-- Scalatra configuration -->
  <!-- ===================================================================== -->
@@ -18,6 +25,9 @@
    <listener-class>org.scalatra.servlet.ScalatraListener</listener-class>
  </listener>

+  <!-- ===================================================================== -->
+  <!-- HTTP interface for Git repositories -->
+  <!-- ===================================================================== -->
  <servlet>
    <servlet-name>GitRepositoryServlet</servlet-name>
    <servlet-class>servlet.GitRepositoryServlet</servlet-class>
@@ -31,10 +41,6 @@
  <!-- ===================================================================== -->
  <!-- H2 database configuration -->
  <!-- ===================================================================== -->
-  <listener>
-    <listener-class>servlet.AutoUpdateListener</listener-class>
-  </listener>
-
  <context-param>
    <param-name>db.user</param-name>
    <param-value>sa</param-value>
Author	SHA1	Message	Date
takezoe	b885a1a0d4	(refs #256 )If account is already registered but disabled, authentication fails.	2014-02-01 17:05:33 +09:00
takezoe	1705bd3ae9	Merge remote-tracking branch 'origin/master'	2014-02-01 07:08:39 +09:00
takezoe	e87c69f989	(refs #251 )Remove BOM from UTF-8 string.	2014-02-01 07:08:03 +09:00
takezoe	1c529eea3d	Disable the post commit hook for Wiki repository.	2014-02-01 07:06:17 +09:00
takezoe	738b0cfe9a	Add version 1.10.	2014-02-01 06:11:18 +09:00
takezoe	913561cb2a	(refs #254 )Remove AUTO_SERVER=TRUE for performance issue.	2014-01-30 20:42:53 +09:00
takezoe	79827efe9b	Merge branch 'master' of https://github.com/takezoe/gitbucket	2014-01-28 03:20:25 +09:00
takezoe	8722cd89fc	Merge branch 'ldap-fullname'	2014-01-28 03:19:40 +09:00
Naoki Takezoe	52fcc4ad1e	Update README.md	2014-01-26 08:43:34 +09:00
takezoe	59a096bfd6	(refs #250 )Include repository name in download zip filename.	2014-01-25 05:25:17 +09:00
takezoe	5a1f541e13	(refs #245 )Add full name attribute for LDAP authentication.	2014-01-25 05:07:32 +09:00
takezoe	94bd1c6a93	Merge branch 'rename-repository'	2014-01-18 18:05:45 +09:00
takezoe	5b1aef5e52	(refs #101 , #102 )Put Repository deletion and transfer ownership together to Danger Zone.	2014-01-18 07:06:48 +09:00
takezoe	89bfcdc44e	(refs #102 )Add validation and auto completion to the transfer user name field	2014-01-18 06:44:39 +09:00
takezoe	fba81138ea	(refs #102 )Experimental implementation of transfer repository ownership	2014-01-18 04:14:32 +09:00
takezoe	d50e07265e	Add unique checking before rename repository.	2014-01-18 03:54:57 +09:00
takezoe	c92891538e	Fix Cancel button position in the comment editing form.	2014-01-18 01:52:59 +09:00
takezoe	ccc1e9bc8b	(refs #246 )Fix issue editing	2014-01-18 01:52:34 +09:00
takezoe	f33b398428	(refs #102 )Change for transfer repository owner.	2014-01-16 19:39:14 +09:00
takezoe	226a8af262	Use old home if it exists.	2014-01-15 05:25:18 +09:00
takezoe	ebcc5ab4b1	(refs #101 )Update links in activity message also.	2014-01-15 04:35:38 +09:00
takezoe	10e16e8379	Use old home if it exists.	2014-01-15 01:28:15 +09:00
takezoe	df1f3d8a00	(refs #101 )Modification to add rename repository name.	2014-01-13 02:09:05 +09:00
takezoe	5e2dfffe25	Use FileUtils#moveDirectory() instead of File#renameTo()	2014-01-12 17:59:02 +09:00
takezoe	897f2ea6dd	Update data directory checking condition.	2014-01-12 16:47:23 +09:00
takezoe	3ff39ec578	Merge SignInController into IndexController	2014-01-12 16:16:09 +09:00
takezoe	3d852a535d	(refs #244 )Change the default data directory to HOME/.gitbucket	2014-01-12 15:41:01 +09:00
takezoe	6f6a61f31a	Fix pattern match for webhook.	2014-01-04 17:23:18 +09:00
takezoe	10f54f5790	Ignore .settings directory.	2014-01-04 04:16:51 +09:00
takezoe	0e7280585a	Fix refs commit log and web hook.	2014-01-04 04:11:41 +09:00
takezoe	1da7173f27	Merge branch 'master' of https://github.com/takezoe/gitbucket	2013-12-28 02:43:57 +09:00
takezoe	1cb1e68a01	Add Version 1.9	2013-12-28 02:43:15 +09:00
Naoki Takezoe	b59c8a5512	Update README.md	2013-12-28 01:49:04 +09:00
Naoki Takezoe	fe63ad0976	Merge pull request #242 from ssogabe/pull-request-messages Fixed pull request messages.They are a bit different from GitHub	2013-12-21 19:57:50 -08:00
ssogabe	941cb7b851	Fixed pull request messages.They are a bit different from GitHub	2013-12-22 12:28:36 +09:00
takezoe	d1cf0d9fd7	(refs #238 )Enable automatic mixed mode of H2.	2013-12-22 02:06:44 +09:00
takezoe	64c2bb4d6b	(refs #237 )Add link to gitbucket.plist	2013-12-21 05:30:48 +09:00
takezoe	24c9f5c17e	(refs #237 )Move gitbucket.plist to contrib.	2013-12-21 05:29:52 +09:00
Naoki Takezoe	d368e4e80d	Merge pull request #237 from hanxue/osx Add plist launcher for OS X and installation instructions	2013-12-20 12:26:32 -08:00
Naoki Takezoe	5c0ff84fc4	Merge pull request #233 from shootaroo/fix-style-readme Fix style markdown table on README.md	2013-12-20 11:51:08 -08:00
Lee Hanxue	502a21b6b6	Add plist launcher for OS X and installation instructions	2013-12-19 17:59:32 +08:00
takezoe	0e9bf59c0f	Remove some functions from ControlUtil.	2013-12-15 04:21:39 +09:00
shootaroo	108f9fccdd	Fix style markdown table on README.md	2013-12-13 19:28:10 +09:00
takezoe	ac884bd7c3	(refs #196 )Fire WebHook in merging pull request from Web GUI.	2013-12-12 04:23:43 +09:00
takezoe	a4cb5c991c	Upgrade scalatra-forms to 0.0.11.	2013-12-12 03:22:37 +09:00
takezoe	68f1f55f37	(refs #223 )Display GITBUCKET_HOME on the system settings.	2013-12-12 03:17:42 +09:00
Naoki Takezoe	1dc779d5e8	Merge pull request #228 from mcveat/compiler-warnings Silenced compiler warnings	2013-12-11 09:53:19 -08:00
Naoki Takezoe	f781c7a08c	Merge pull request #220 from maliayas/patch-1 Turn off autocomplete on "Add collaborator" form	2013-12-03 12:13:20 -08:00
Naoki Takezoe	a8511a9f39	Merge pull request #221 from drwlrsn/master Fixes issue #216	2013-12-03 12:08:45 -08:00
Piotr Adamski	47714eec45	Silenced compiler warnings	2013-12-03 18:41:41 +01:00
takezoe	c46e9b2f4d	(refs #204 )Replace order of ScalatraListener and AutoUpdateListener	2013-12-03 02:16:00 +09:00
Drew Larson	26d579f13f	Fixes issue #216 Added a div element to wrap the buttons so they are vertically aligned with each other. Also converted input and a elements to button elements as Bootstrap recommends: http://getbootstrap.com/css/#buttons-tags	2013-12-01 19:56:21 -06:00
Ali Ayas	6556d26742	Turn off autocomplete on "Add collaborator" form You have already created js autocomplete for that input, so it is good to turn off the browser autocomplete. If there are more forms that have custom autocomplete, this change should be applied to them, too.	2013-12-01 23:55:34 +02:00
Naoki Takezoe	608dce2205	Update README.md	2013-11-30 21:20:12 +09:00
Naoki Takezoe	f86e50c723	Update README.md	2013-11-30 21:04:21 +09:00