3.10 release

2026-05-09 10:47:31 +02:00 · 2015-12-30 01:43:22 +09:00
172 changed files with 2291 additions and 3735 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,7 +0,0 @@
-# Guideline for Issues
-
- At first, See [FAQ](https://github.com/gitbucket/gitbucket/wiki/FAQ) and check issues whether there is a same question or request in the past.
- If you can't find same question and report, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
- We can also support in Japaneses other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
- Write an issue in English. At least, write subject in English.
- First priority of GitBucket is easy installation and reproduce GitHub behavior, so we might reject if your request is against it.
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,19 +0,0 @@
-### Before submitting an issue to Gitbucket I have first:
-
- [] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/CONTRIBUTING.md)
- [] searched for similar already existing issue
- [] read the documentation and [wiki](https://github.com/gitbucket/gitbucket/wiki) 
-
-*(if you have performed all the above, remove the paragraph and continue describing the issue with template below)*
-
-## Issue
-**Impacted version**: xxxx
-
-**Deployment mode**: *explain here how you use gitbucket : standalone app, under webcontainer (which one), with an http frontend (nginx, httpd, ...)*
-
-**Problem description**:
- *be as explicit has you can*
- *describe the problem and its symptoms*
- *explain how to reproduce*
- *attach whatever information that can help understanding the context (screen capture, log files)*
- *do your best to use a correct english (re-read yourself)*
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +0,0 @@
-### Before submitting a pull-request to Gitbucket I have first:
-
- [] read the [contribution guidelines](https://github.com/gitbucket/gitbucket/blob/master/CONTRIBUTING.md)
- [] rebased my branch over master
- [] verified that project is compiling
- [] verified that tests are passing
- [] squashed my commits as appropriate *(keep several commits if it is relevant to understand the PR)*
- [] [marked as closed](https://help.github.com/articles/closing-issues-via-commit-messages/) all issue ID that this PR should correct
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,7 @@
+# Guideline for Issues
+
+- If you have any question about GitBucket, send it to [gitter room](https://gitter.im/gitbucket/gitbucket) before raise an issue.
+- Make sure check whether there is a same question or request in the past.
+- When raise a new issue, write subject in **English** at least.
+- We can also support in Japaneses other than English at [gitter room for Japanese](https://gitter.im/gitbucket/gitbucket_ja).
+- First priority of GitBucket is easy installation and reproduce GitHub behavior, so we might reject if your request is against it.
--- a/README.md
+++ b/README.md
@@ -9,21 +9,28 @@ The current version of GitBucket provides a basic features below:

 - Public / Private Git repository (http and ssh access)
 - Repository viewer and online file editing
+- Repository search (Code and Issues)
 - Wiki
- Issues / Pull request
+- Issues
+- Fork / Pull request
 - Email notification
+- Activity timeline
 - Simple user and group management with LDAP integration
+- Gravatar support
 - Plug-in system

-If you want to try the development version of GitBucket, see [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/how_to_run.md).
+If you want to try the development version of GitBucket, see the documentation for developers at [Wiki](https://github.com/gitbucket/gitbucket/wiki).

 Installation
 --------
-GitBucket requires **Java8**. You have to install beforehand when it's not installed.

 1. Download latest **gitbucket.war** from [the release page](https://github.com/gitbucket/gitbucket/releases).
 2. Deploy it to the Servlet 3.0 container such as Tomcat 7.x, Jetty 8.x, GlassFish 3.x or higher.
-3. Access **http://[hostname]:[port]/gitbucket/** using your web browser and logged-in with **root** / **root**.
+3. Access **http://[hostname]:[port]/gitbucket/** using your web browser.
+
+If you are using Gitbucket behind a webserver please make sure you have increased the **client_max_body_size** (on nginx)
+
+The default administrator account is **root** and password is **root**.

 or you can start GitBucket by `java -jar gitbucket.war` without servlet container. In this case, GitBucket URL is **http://[hostname]:8080/**. You can specify following options.

@@ -34,7 +41,35 @@ or you can start GitBucket by `java -jar gitbucket.war` without servlet containe

 To upgrade GitBucket, only replace gitbucket.war after stop GitBucket. All GitBucket data is stored in HOME/.gitbucket. So if you want to back up GitBucket data, copy this directory to the other disk.

-About installation on Mac or Windows Server (with IIS), configuration of Apache or Nginx and also integration with other tools or services such as Jenkins or Slack, see [Wiki](https://github.com/gitbucket/gitbucket/wiki).
+For Installation on Windows Server with IIS see [this wiki page](https://github.com/gitbucket/gitbucket/wiki/Installation-on-IIS-and-Helicontech-Zoo)
+
+### Mac OS X
+#### Installing Via Homebrew
+
+```
+$ brew install gitbucket
+==> Downloading https://github.com/takezoe/gitbucket/releases/download/1.10/gitbucket.war
+######################################################################## 100.0%
+==> Caveats
+Note: When using launchctl the port will be 8080.
+
+To have launchd start gitbucket at login:
+    ln -sfv /usr/local/opt/gitbucket/*.plist ~/Library/LaunchAgents
+Then to load gitbucket now:
+    launchctl load ~/Library/LaunchAgents/homebrew.mxcl.gitbucket.plist
+Or, if you don't want/need launchctl, you can just run:
+    java -jar /usr/local/opt/gitbucket/libexec/gitbucket.war
+==> Summary
+/usr/local/Cellar/gitbucket/1.10: 3 files, 42M, built in 11 seconds
+```
+
+#### Manual Installation
+On OS X, generate `gitbucket.plist` by [this script](https://raw.githubusercontent.com/gitbucket/gitbucket/master/contrib/macosx/makePlist) and copy it 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`

 Plug-ins
 --------
@@ -60,26 +95,10 @@ Support

 Release Notes
 --------
-### 3.12 - 27 Feb 2016
- New GitHub UI
- Improve mobile view
- Improve printing style
- Individual URL for pull request tabs
- SSH host configuration is separated from HTTP base URL
-
-### 3.11 - 30 Jan 2016
- Upgrade Scalatra to 2.4
- Sidebar and Footer for Wiki
- Branch protection and receive hook extension point for plug-in
- Limit recent updated repositories list
- Issue actions look-alike GitHub
- Web API for labels
- Requires Java 8
-
 ### 3.10 - 30 Dec 2015
 - Move to Bootstrap3
 - New URL for raw contents (`raw/master/doc/activity.md` instead of `blob/master/doc/activity.md?raw=true`)
- Update xsbt-web-plugin
+- Update xsbt-web-pligin
 - Update H2 database

 ### 3.9 - 5 Dec 2015
@@ -323,3 +342,7 @@ Release Notes

 ### 1.0 - 04 Jul 2013
 - This is a first public release
+
+Sponsors
+--------
+[![IntelliJ IDEA](https://www.jetbrains.com/idea/docs/logo_intellij_idea.png)](https://www.jetbrains.com/idea/)
--- a/build.sbt
+++ b/build.sbt
@@ -1,159 +0,0 @@
-val Organization = "gitbucket"
-val Name = "gitbucket"
-val GitBucketVersion = "3.12.0"
-val ScalatraVersion = "2.4.0"
-val JettyVersion = "9.3.6.v20151106"
-
-lazy val root = (project in file(".")).enablePlugins(SbtTwirl, JettyPlugin)
-
-sourcesInBase := false
-organization := Organization
-name := Name
-version := GitBucketVersion
-scalaVersion := "2.11.7"
-
-// dependency settings
-resolvers ++= Seq(
-  Classpaths.typesafeReleases,
-  "amateras-repo" at "http://amateras.sourceforge.jp/mvn/",
-  "amateras-snapshot-repo" at "http://amateras.sourceforge.jp/mvn-snapshot/"
-)
-libraryDependencies ++= Seq(
-  "org.eclipse.jgit"          % "org.eclipse.jgit.http.server" % "4.1.1.201511131810-r",
-  "org.eclipse.jgit"          % "org.eclipse.jgit.archive"     % "4.1.1.201511131810-r",
-  "org.scalatra"             %% "scalatra"                     % ScalatraVersion,
-  "org.scalatra"             %% "scalatra-json"                % ScalatraVersion,
-  "org.json4s"               %% "json4s-jackson"               % "3.3.0",
-  "io.github.gitbucket"      %% "scalatra-forms"               % "1.0.0",
-  "commons-io"                % "commons-io"                   % "2.4",
-  "io.github.gitbucket"       % "markedj"                      % "1.0.6",
-  "org.apache.commons"        % "commons-compress"             % "1.10",
-  "org.apache.commons"        % "commons-email"                % "1.4",
-  "org.apache.httpcomponents" % "httpclient"                   % "4.5.1",
-  "org.apache.sshd"           % "apache-sshd"                  % "1.0.0",
-  "org.apache.tika"           % "tika-core"                    % "1.11",
-  "com.typesafe.slick"       %% "slick"                        % "2.1.0",
-  "com.novell.ldap"           % "jldap"                        % "2009-10-07",
-  "com.h2database"            % "h2"                           % "1.4.190",
-  "ch.qos.logback"            % "logback-classic"              % "1.1.1",
-  "com.mchange"               % "c3p0"                         % "0.9.5.2",
-  "com.typesafe"              % "config"                       % "1.3.0",
-  "com.typesafe.akka"        %% "akka-actor"                   % "2.3.14",
-  "com.enragedginger"        %% "akka-quartz-scheduler"        % "1.4.0-akka-2.3.x" exclude("c3p0","c3p0"),
-  "org.eclipse.jetty"         % "jetty-webapp"                 % JettyVersion     % "provided",
-  "javax.servlet"             % "javax.servlet-api"            % "3.1.0"          % "provided",
-  "junit"                     % "junit"                        % "4.12"           % "test",
-  "org.scalatra"             %% "scalatra-scalatest"           % ScalatraVersion  % "test",
-  "org.scalaz"               %% "scalaz-core"                  % "7.2.0"          % "test"
-)
-
-// Twirl settings
-play.twirl.sbt.Import.TwirlKeys.templateImports += "gitbucket.core._"
-
-// Compiler settings
-scalacOptions := Seq("-deprecation", "-language:postfixOps")
-javacOptions in compile ++= Seq("-target", "8", "-source", "8")
-javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
-testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "junitxml", "console")
-javaOptions in Test += "-Dgitbucket.home=target/gitbucket_home_for_test"
-testOptions in Test += Tests.Setup( () => new java.io.File("target/gitbucket_home_for_test").mkdir() )
-fork in Test := true
-packageOptions += Package.MainClass("JettyLauncher")
-
-// Assembly settings
-test in assembly := {}
-assemblyMergeStrategy in assembly := {
-  case PathList("META-INF", xs @ _*) =>
-    (xs map {_.toLowerCase}) match {
-      case ("manifest.mf" :: Nil) => MergeStrategy.discard
-      case _ => MergeStrategy.discard
-    }
-  case x => MergeStrategy.first
-}
-
-// JRebel
-jrebel.webLinks += (target in webappPrepare).value
-jrebel.enabled := System.getenv().get("JREBEL") != null
-javaOptions in Jetty ++= Option(System.getenv().get("JREBEL")).toSeq.flatMap { path =>
-  Seq("-noverify", "-XX:+UseConcMarkSweepGC", "-XX:+CMSClassUnloadingEnabled", s"-javaagent:${path}")
-}
-jrebelSettings
-
-// Create executable war file
-val executableConfig = config("executable").hide
-Keys.ivyConfigurations += executableConfig
-libraryDependencies	++= Seq(
-  "org.eclipse.jetty"	%	"jetty-security"     % JettyVersion % "executable",
-  "org.eclipse.jetty"	%	"jetty-webapp"       % JettyVersion % "executable",
-  "org.eclipse.jetty"	%	"jetty-continuation" % JettyVersion % "executable",
-  "org.eclipse.jetty"	%	"jetty-server"       % JettyVersion % "executable",
-  "org.eclipse.jetty"	%	"jetty-xml"          % JettyVersion % "executable",
-  "org.eclipse.jetty"	%	"jetty-http"         % JettyVersion % "executable",
-  "org.eclipse.jetty"	%	"jetty-servlet"      % JettyVersion % "executable",
-  "org.eclipse.jetty"	%	"jetty-io"           % JettyVersion % "executable",
-  "org.eclipse.jetty"	%	"jetty-util"         % JettyVersion % "executable"
-)
-
-val executableKey	= TaskKey[File]("executable")
-executableKey	:= {
-  import org.apache.ivy.util.ChecksumHelper
-  import java.util.jar.{ Manifest => JarManifest }
-  import java.util.jar.Attributes.{ Name => AttrName }
-
-  val workDir	= Keys.target.value / "executable"
-  val warName	= Keys.name.value + ".war"
-
-  val log		= streams.value.log
-  log info s"building executable webapp in ${workDir}"
-
-  // initialize temp directory
-  val temp	= workDir / "webapp"
-  IO delete temp
-
-  // include jetty classes
-  val jettyJars	= Keys.update.value select configurationFilter(name = executableConfig.name)
-  jettyJars foreach { jar =>
-    IO unzip (jar, temp, (name:String) =>
-      (name startsWith "javax/") ||
-      (name startsWith "org/")
-    )
-  }
-
-  // include original war file
-  val warFile	= (Keys.`package`).value
-  IO unzip (warFile, temp)
-
-  // include launcher classes
-  val classDir		= (Keys.classDirectory in Compile).value
-  val launchClasses	= Seq("JettyLauncher.class" /*, "HttpsSupportConnector.class" */)
-  launchClasses foreach { name =>
-    IO copyFile (classDir / name, temp / name)
-  }
-
-  // zip it up
-  IO delete (temp / "META-INF" / "MANIFEST.MF")
-  val contentMappings	= (temp.*** --- PathFinder(temp)).get pair relativeTo(temp)
-  val manifest		= new JarManifest
-  manifest.getMainAttributes put (AttrName.MANIFEST_VERSION,	"1.0")
-  manifest.getMainAttributes put (AttrName.MAIN_CLASS,		"JettyLauncher")
-  val outputFile		= workDir / warName
-  IO jar (contentMappings, outputFile, manifest)
-
-  // generate checksums
-  Seq("md5", "sha1") foreach { algorithm =>
-    IO.write(
-      workDir / (warName + "." + algorithm),
-      ChecksumHelper computeAsString (outputFile, algorithm)
-    )
-  }
-
-  // done
-  log info s"built executable webapp ${outputFile}"
-  outputFile
-}
-/*
-Keys.artifact in (Compile, executableKey) ~= {
-	_ copy (`type` = "war", extension = "war"))
-}
-addArtifact(Keys.artifact in (Compile, executableKey), executableKey)
-*/
--- a/doc/auto_update.md
+++ b/doc/auto_update.md
@@ -8,7 +8,7 @@ To release a new version of GitBucket, add the version definition to the [gitbuc
 object AutoUpdate {
  ...
  /**
-   * The history of versions. A head of this sequence is the current GitBucket version.
+   * The history of versions. A head of this sequence is the current BitBucket version.
   */
  val versions = Seq(
      Version(1, 0)
@@ -20,7 +20,7 @@ Next, add a SQL file which updates database schema into [/src/main/resources/upd

 GitBucket stores the current version to ```GITBUCKET_HOME/version``` and checks it at start-up. If the stored version differs from the actual version, it executes differences of SQL files between the stored version and the actual version. And ```GITBUCKET_HOME/version``` is updated by the actual version.

-We can also add any Scala code for upgrade GitBucket which modifies resources other than database. Override ```Version.update``` like below:
+We can also add any Scala code for upgrade GitBucket which modifies ｒesources other than database. Override ```Version.update``` like below:

 ```scala
 val versions = Seq(
--- a/doc/directory.md
+++ b/doc/directory.md
@@ -8,10 +8,10 @@ This directory has following structure:
 * /HOME/gitbucket
  * /repositories 
    * /USER_NAME
-      * /REPO_NAME.git (substance of repository. GitServlet sees this directory)
-      * /REPO_NAME
+      * / REPO_NAME.git (substance of repository. GitServlet sees this directory)
+      * / REPO_NAME
        * /issues (files which are attached to issue)
-      * /REPO_NAME.wiki.git (wiki repository)
+      * / REPO_NAME.wiki.git (wiki repository)
  * /data
    * /USER_NAME
      * /files
--- a/doc/how_to_run.md
+++ b/doc/how_to_run.md
@@ -27,8 +27,7 @@ $ sbt package

 To build executable war file, run

-```
-$ sbt executable
-```
+*  Windows: Not available
+*  Linux: `./release/make-release-war.sh`

-at the top of the source tree. It generates executable `gitbucket.war` into `target/executable`. We release this war file as release artifact.
+at the top of the source tree. It generates executable `gitbucket.war` into `target/scala-2.11`. We release this war file as release artifact.
--- a/doc/jrebel.md
+++ b/doc/jrebel.md
@@ -1,148 +0,0 @@
-JRebel integration (optional)
-=============================
-
-[JRebel](http://zeroturnaround.com/software/jrebel/) is a JVM plugin that makes developing web apps much faster.
-JRebel is generally able to eliminate the need for the following slow "app restart" in sbt following a code change:
-
-```
-> jetty:start
-```
-
-While JRebel is not open source, it does reload your code faster than the `~;copy-resources;aux-compile` way of doing things using `sbt`.
-
-It's only used during development, and doesn't change your deployed app in any way.
-
-JRebel used to be free for Scala developers, but that changed recently, and now there's a cost associated with usage for Scala. There are trial plans and free non-commercial licenses available if you just want to try it out.
-
----
-
-## 1. Get a JRebel license
-
-Sign up for a [usage plan](https://my.jrebel.com/). You will need to create an account.
-
-## 2. Download JRebel
-
-Download the most recent ["nosetup" JRebel zip](http://zeroturnaround.com/software/jrebel/download/prev-releases/).
-Next, unzip the downloaded file.
-
-## 3. Activate
-
-Follow the [instructions on the JRebel website](http://zeroturnaround.com/software/jrebel/download/prev-releases/) to activate your downloaded JRebel.
-
-You can use the default settings for all the configurations.
-
-You don't need to integrate with your IDE, since we're using sbt to do the servlet deployment.
-
-## 4. Tell jvm where JRebel is
-
-Fortunately, the gitbucket project is already set up to use JRebel.
-You only need to tell jvm where to find the jrebel jar.
-
-To do so, edit your shell resource file (usually `~/.bash_profile` on Mac, and `~/.bashrc` on Linux), and add the following line:
-
-```bash
-export JREBEL=/path/to/jrebel/jrebel.jar
-```
-
-For example, if you unzipped your JRebel download in your home directory, you whould use:
-
-```bash
-export JREBEL=~/jrebel/jrebel.jar
-```
-
-Now reload your shell:
-
-```
-$ source ~/.bash_profile # on Mac
-$ source ~/.bashrc       # on Linux
-```
-
-## 5. See it in action!
-
-Now you're ready to use JRebel with the gitbucket.
-When you run sbt as normal, you will see a long message from JRebel, indicating it has loaded.
-Here's an abbreviated version of what you will see:
-
-```
-$ ./sbt
-[info] Loading project definition from /git/gitbucket/project
-[info] Set current project to gitbucket (in build file:/git/gitbucket/)
->
-```
-
-You will start the servlet container slightly differently now that you're using sbt.
-
-```
-> jetty:start
-:
-[info] starting server ...
-[success] Total time: 3 s, completed Jan 3, 2016 9:47:55 PM
-2016-01-03 21:47:57 JRebel:
-2016-01-03 21:47:57 JRebel: A newer version '6.3.1' is available for download
-2016-01-03 21:47:57 JRebel: from http://zeroturnaround.com/software/jrebel/download/
-2016-01-03 21:47:57 JRebel:
-2016-01-03 21:47:58 JRebel: Contacting myJRebel server ..
-2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/scala-2.11/classes' will be monitored for changes.
-2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/scala-2.11/test-classes' will be monitored for changes.
-2016-01-03 21:47:59 JRebel: Directory '/git/gitbucket/target/webapp' will be monitored for changes.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  #############################################################
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  JRebel Legacy Agent 6.2.5 (201509291538)
-2016-01-03 21:48:00 JRebel:  (c) Copyright ZeroTurnaround AS, Estonia, Tartu.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  Over the last 30 days JRebel prevented
-2016-01-03 21:48:00 JRebel:  at least 182 redeploys/restarts saving you about 7.4 hours.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  Over the last 324 days JRebel prevented
-2016-01-03 21:48:00 JRebel:  at least 1538 redeploys/restarts saving you about 62.4 hours.
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  Licensed to nazo king (using myJRebel).
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:
-2016-01-03 21:48:00 JRebel:  #############################################################
-2016-01-03 21:48:00 JRebel:
-:
-
-> ~ copy-resources
-[success] Total time: 0 s, completed Jan 3, 2016 9:13:54 PM
-1. Waiting for source changes... (press enter to interrupt)
-```
-
-Finally, change your code.
-For example, you can change the title on `src/main/twirl/gitbucket/core/main.scala.html` like this:
-
-```html
-:
-  <a class="navbar-brand" href="@path/">
-    <img src="@assets/common/images/gitbucket.png" style="width: 24px; height: 24px;"/>GitBucket
-    @defining(AutoUpdate.getCurrentVersion){ version =>
-      <span class="header-version">@version.majorVersion.@version.minorVersion</span>
-    }
-    change code !!!!!!!!!!!!!!!!
-  </a>
-:
-```
-
-If JRebel is doing is correctly installed you will see a notice for you:
-
-```
-1. Waiting for source changes... (press enter to interrupt)
-2016-01-03 21:48:42 JRebel: Reloading class 'gitbucket.core.html.main$'.
-[info] Wrote rebel.xml to /git/gitbucket/target/scala-2.11/resource_managed/main/rebel.xml
-[info] Compiling 1 Scala source to /git/gitbucket/target/scala-2.11/classes...
-[success] Total time: 3 s, completed Jan 3, 2016 9:48:55 PM
-2. Waiting for source changes... (press enter to interrupt)
-```
-
-And you reload browser, JRebel give notice of that it has reloaded classes:
-
-```
-[success] Total time: 3 s, completed Jan 3, 2016 9:48:55 PM
-2. Waiting for source changes... (press enter to interrupt)
-2016-01-03 21:49:13 JRebel: Reloading class 'gitbucket.core.html.main$'.
-```
-
-## 6. Limitations
-
-JRebel is nearly always able to eliminate the need to explicitly reload your container after a code change. However, if you change any of your routes patterns, there is nothing JRebel can do, you will have to run `jetty:start`.
--- a/doc/readme.md
+++ b/doc/readme.md
@@ -9,4 +9,3 @@ Developer's Guide
 * [Notification Email](notification.md)
 * [Automatic Schema Updating](auto_update.md)
 * [Release Operation](release.md)
- * [JRebel integration (optional)](jrebel.md)
--- a/doc/release.md
+++ b/doc/release.md
@@ -23,7 +23,7 @@ object MyBuild extends Build {
 object AutoUpdate {

  /**
-   * The history of versions. A head of this sequence is the current GitBucket version.
+   * The history of versions. A head of this sequence is the current BitBucket version.
   */
  val versions = Seq(
    new Version(3, 3), // <---- add this line!!
@@ -37,10 +37,11 @@ Note: Release operation requires [Ant](http://ant.apache.org/) and [Maven](https

 ### Make release war file

-Run `sbt executable`. The release war file and fingerprint are generated into `target/executable/gitbucket.war`.
+Run `release/make-release-war.sh`. The release war file is generated into `target/scala-2.11/gitbucket.war`.

 ```bash
-$sbt executable
+$ cd release
+$ ./make-release-war.sh
 ```

 ### Deploy assembly jar file
--- a/embed-jetty/javax.servlet-3.0.0.v201112011016.jar
+++ b/embed-jetty/javax.servlet-3.0.0.v201112011016.jar
--- a/embed-jetty/jetty-continuation-8.1.16.v20140903.jar
+++ b/embed-jetty/jetty-continuation-8.1.16.v20140903.jar
--- a/embed-jetty/jetty-http-8.1.16.v20140903.jar
+++ b/embed-jetty/jetty-http-8.1.16.v20140903.jar
--- a/embed-jetty/jetty-io-8.1.16.v20140903.jar
+++ b/embed-jetty/jetty-io-8.1.16.v20140903.jar
--- a/embed-jetty/jetty-security-8.1.16.v20140903.jar
+++ b/embed-jetty/jetty-security-8.1.16.v20140903.jar
--- a/embed-jetty/jetty-server-8.1.16.v20140903.jar
+++ b/embed-jetty/jetty-server-8.1.16.v20140903.jar
--- a/embed-jetty/jetty-servlet-8.1.16.v20140903.jar
+++ b/embed-jetty/jetty-servlet-8.1.16.v20140903.jar
--- a/embed-jetty/jetty-util-8.1.16.v20140903.jar
+++ b/embed-jetty/jetty-util-8.1.16.v20140903.jar
--- a/embed-jetty/jetty-webapp-8.1.16.v20140903.jar
+++ b/embed-jetty/jetty-webapp-8.1.16.v20140903.jar
--- a/embed-jetty/jetty-xml-8.1.16.v20140903.jar
+++ b/embed-jetty/jetty-xml-8.1.16.v20140903.jar
--- a/embed-jetty/update.sh
+++ b/embed-jetty/update.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+version=$1
+output_dir=`dirname $0`
+git rm -f ${output_dir}/jetty-*.jar
+for name in 'io' 'servlet' 'xml' 'continuation' 'security' 'util' 'http' 'server' 'webapp'
+do
+  jar_filename="jetty-${name}-${version}.jar"
+  wget "http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-${name}/${version}/${jar_filename}" -O ${output_dir}/${jar_filename}
+done
+git add ${output_dir}/*.jar
+git commit
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.9
+sbt.version=0.13.8
--- a/project/build.scala
+++ b/project/build.scala
@@ -0,0 +1,80 @@
+import com.earldouglas.xwp.JettyPlugin
+import play.twirl.sbt.SbtTwirl
+import sbt.Keys._
+import sbt._
+import sbtassembly.AssemblyKeys._
+import sbtassembly._
+import JettyPlugin.autoImport._
+
+object MyBuild extends Build {
+  val Organization = "gitbucket"
+  val Name = "gitbucket"
+  val Version = "3.10.0"
+  val ScalaVersion = "2.11.6"
+  val ScalatraVersion = "2.3.1"
+
+  lazy val project = Project (
+    "gitbucket",
+    file(".")
+  )
+//  .settings(ScalatraPlugin.scalatraWithJRebel: _*)
+  .settings(
+    test in assembly := {},
+    assemblyMergeStrategy in assembly := {
+      case PathList("META-INF", xs @ _*) =>
+        (xs map {_.toLowerCase}) match {
+          case ("manifest.mf" :: Nil) => MergeStrategy.discard
+          case _ => MergeStrategy.discard
+      }
+      case x => MergeStrategy.first
+    }
+  )
+  .settings(
+    sourcesInBase := false,
+    organization := Organization,
+    name := Name,
+    version := Version,
+    scalaVersion := ScalaVersion,
+    resolvers ++= Seq(
+      Classpaths.typesafeReleases,
+      "amateras-repo" at "http://amateras.sourceforge.jp/mvn/",
+      "amateras-snapshot-repo" at "http://amateras.sourceforge.jp/mvn-snapshot/"
+    ),
+    scalacOptions := Seq("-deprecation", "-language:postfixOps"),
+    libraryDependencies ++= Seq(
+      "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "3.4.2.201412180340-r",
+      "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "3.4.2.201412180340-r",
+      "org.scalatra" %% "scalatra" % ScalatraVersion,
+      "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
+      "org.scalatra" %% "scalatra-json" % ScalatraVersion,
+      "org.json4s" %% "json4s-jackson" % "3.2.11",
+      "jp.sf.amateras" %% "scalatra-forms" % "0.2.0",
+      "commons-io" % "commons-io" % "2.4",
+      "io.github.gitbucket" % "markedj" % "1.0.6-SNAPSHOT",
+      "org.apache.commons" % "commons-compress" % "1.9",
+      "org.apache.commons" % "commons-email" % "1.3.3",
+      "org.apache.httpcomponents" % "httpclient" % "4.3.6",
+      "org.apache.sshd" % "apache-sshd" % "1.0.0",
+      "org.apache.tika" % "tika-core" % "1.10",
+      "com.typesafe.slick" %% "slick" % "2.1.0",
+      "com.novell.ldap" % "jldap" % "2009-10-07",
+      "com.h2database" % "h2" % "1.4.180",
+      "ch.qos.logback" % "logback-classic" % "1.1.1",
+      "org.eclipse.jetty" % "jetty-webapp" % "8.1.16.v20140903" % "provided",
+      "javax.servlet" % "javax.servlet-api" % "3.0.1" % "provided",
+      "junit" % "junit" % "4.12" % "test",
+      "com.mchange" % "c3p0" % "0.9.5.2",
+      "com.typesafe" % "config" % "1.2.1",
+      "com.typesafe.akka" %% "akka-actor" % "2.3.10",
+      "com.enragedginger" %% "akka-quartz-scheduler" % "1.3.0-akka-2.3.x"  exclude("c3p0","c3p0")
+    ),
+    play.twirl.sbt.Import.TwirlKeys.templateImports += "gitbucket.core._",
+    javacOptions in compile ++= Seq("-target", "7", "-source", "7"),
+    javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml",
+    testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "junitxml", "console"),
+    javaOptions in Test += "-Dgitbucket.home=target/gitbucket_home_for_test",
+    testOptions in Test += Tests.Setup( () => new java.io.File("target/gitbucket_home_for_test").mkdir() ),
+    fork in Test := true,
+    packageOptions += Package.MainClass("JettyLauncher")
+  ).enablePlugins(SbtTwirl, JettyPlugin)
+}
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,5 +2,4 @@ scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")

 addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"       % "1.0.4")
 addSbtPlugin("com.eed3si9n"     % "sbt-assembly"    % "0.12.0")
-addSbtPlugin("com.earldouglas"  % "xsbt-web-plugin" % "2.1.0")
-addSbtPlugin("fi.gekkio.sbtplugins" % "sbt-jrebel-plugin" % "0.10.0")
+addSbtPlugin("com.earldouglas"  % "xsbt-web-plugin" % "2.1.0")
--- a/release/build.xml
+++ b/release/build.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<project name="gitbucket" default="all" basedir="..">
+
+  <property environment="env"/>
+  <property name="target.dir" value="target"/>
+  <property name="embed.classes.dir" value="${target.dir}/embed-classes"/>
+  <property name="jetty.dir" value="embed-jetty"/>
+  <property name="scala.version" value="2.11"/>
+  <property name="gitbucket.version" value="${env.GITBUCKET_VERSION}"/>
+  <property name="jetty.version" value="8.1.16.v20140903"/>
+  <property name="servlet.version" value="3.0.0.v201112011016"/>
+
+  <condition property="sbt.exec" value="sbt.bat" else="sbt.sh">
+    <os family="windows" />
+  </condition>
+
+  <target name="clean">
+    <delete dir="${embed.classes.dir}"/>
+    <delete file="${target.dir}/scala-${scala.version}/gitbucket.war"/>
+  </target>
+
+  <target name="war" depends="clean">
+    <exec executable="${sbt.exec}" resolveexecutable="true" failonerror="true">
+      <arg line="clean compile test package" />
+    </exec>
+  </target>
+
+  <target name="embed" depends="war">
+    <mkdir dir="${embed.classes.dir}"/>
+
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/javax.servlet-${servlet.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-continuation-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-http-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-io-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-security-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-server-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-servlet-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-util-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-webapp-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-xml-${jetty.version}.jar" />
+
+    <zip destfile="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war"
+         basedir="${embed.classes.dir}"
+         update = "true"
+         includes="javax/**,org/**"/>
+
+    <zip destfile="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war"
+         basedir="${target.dir}/scala-${scala.version}/classes"
+         update = "true"
+         includes="JettyLauncher.class,HttpsSupportConnector.class"/>
+  </target>
+
+  <target name="rename" depends="embed">
+    <move file="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war"
+            tofile="${target.dir}/scala-${scala.version}/gitbucket.war"/>
+  </target>
+
+  <target name="checksum" depends="rename">
+    <checksum file="${target.dir}/scala-${scala.version}/gitbucket.war" algorithm="MD5" format="MD5SUM" forceOverwrite="yes" fileext=".md5"/>
+    <checksum file="${target.dir}/scala-${scala.version}/gitbucket.war" algorithm="SHA" format="MD5SUM" forceOverwrite="yes" fileext=".sha1"/>
+  </target>
+
+  <target name="all" depends="checksum">
+  </target>
+
+
+</project>
--- a/release/deploy-assembly-jar.sh
+++ b/release/deploy-assembly-jar.sh
@@ -5,15 +5,6 @@ cd ../
 ./sbt.sh clean assembly

 cd release
-
-if [[ "$GITBUCKET_VERSION" =~ -SNAPSHOT$ ]]; then
-  MVN_DEPLOY_PATH=mvn-snapshot
-else
-  MVN_DEPLOY_PATH=mvn
-fi
-
-echo $MVN_DEPLOY_PATH
-
 mvn deploy:deploy-file \
  -DgroupId=gitbucket\
  -DartifactId=gitbucket-assembly\
@@ -21,4 +12,4 @@ mvn deploy:deploy-file \
  -Dpackaging=jar\
  -Dfile=../target/scala-2.11/gitbucket-assembly-$GITBUCKET_VERSION.jar\
  -DrepositoryId=sourceforge.jp\
-  -Durl=scp://shell.sourceforge.jp/home/groups/a/am/amateras/htdocs/$MVN_DEPLOY_PATH/
+  -Durl=scp://shell.sourceforge.jp/home/groups/a/am/amateras/htdocs/mvn/
--- a/release/env.sh
+++ b/release/env.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
-export GITBUCKET_VERSION=`cat ../build.sbt | grep 'val GitBucketVersion' | cut -d \" -f 2`
+export GITBUCKET_VERSION=`cat ../project/build.scala | grep 'val Version' | cut -d \" -f 2`
 echo "GITBUCKET_VERSION: $GITBUCKET_VERSION"
--- a/release/make-release-war.sh
+++ b/release/make-release-war.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+D="$(dirname "$0")"
+D="$(cd "${D}"; pwd)"
+DD="$(dirname "${D}")"
+(
+  for f in "${D}/env.sh" "${D}/build.xml"; do
+    if [ ! -s "${f}" ]; then
+      echo >&2 "$0: Unable to access file '${f}'"
+      exit 1
+    fi
+  done
+  . "${D}/env.sh"
+  cd "${DD}"
+  ant -f "${D}/build.xml" all
+)
--- a/sbt-launch-0.13.8.jar
+++ b/sbt-launch-0.13.8.jar
--- a/sbt.bat
+++ b/sbt.bat
@@ -1,2 +1,2 @@
 set SCRIPT_DIR=%~dp0
-java %JAVA_OPTS% -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.13.9.jar" %*
+java %JAVA_OPTS% -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar "%SCRIPT_DIR%\sbt-launch-0.13.8.jar" %*
--- a/sbt.sh
+++ b/sbt.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-java $JAVA_OPTS -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.9.jar "$@"
+java $JAVA_OPTS -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.8.jar "$@"
--- a/src/main/java/JettyLauncher.java
+++ b/src/main/java/JettyLauncher.java
@@ -1,4 +1,5 @@
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.webapp.WebAppContext;

 import java.io.File;
@@ -29,16 +30,16 @@ public class JettyLauncher {
            }
        }

-        Server server = new Server(port);
+        Server server = new Server();

-//        SelectChannelConnector connector = new SelectChannelConnector();
-//        if(host != null) {
-//            connector.setHost(host);
-//        }
-//        connector.setMaxIdleTime(1000 * 60 * 60);
-//        connector.setSoLingerTime(-1);
-//        connector.setPort(port);
-//        server.addConnector(connector);
+        SelectChannelConnector connector = new SelectChannelConnector();
+        if(host != null) {
+            connector.setHost(host);
+        }
+        connector.setMaxIdleTime(1000 * 60 * 60);
+        connector.setSoLingerTime(-1);
+        connector.setPort(port);
+        server.addConnector(connector);

        WebAppContext context = new WebAppContext();

--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -6,14 +6,12 @@
    </encoder>
  </appender>

-  <!--
  <appender name="FILE" class="ch.qos.logback.core.FileAppender">
    <file>gitbucket.log</file>
    <encoder>
      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
    </encoder>
  </appender>
-  -->

  <root level="INFO">
    <appender-ref ref="STDOUT" />
--- a/src/main/resources/update/3_11.sql
+++ b/src/main/resources/update/3_11.sql
@@ -1,25 +0,0 @@
-DROP TABLE IF EXISTS PROTECTED_BRANCH;
-
-CREATE TABLE PROTECTED_BRANCH(
-    USER_NAME VARCHAR(100) NOT NULL,
-    REPOSITORY_NAME VARCHAR(100) NOT NULL,
-    BRANCH VARCHAR(100) NOT NULL,
-    STATUS_CHECK_ADMIN BOOLEAN NOT NULL DEFAULT false
-);
-
-ALTER TABLE PROTECTED_BRANCH ADD CONSTRAINT IDX_PROTECTED_BRANCH_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, BRANCH);
-ALTER TABLE PROTECTED_BRANCH ADD CONSTRAINT IDX_PROTECTED_BRANCH_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME)
-  ON DELETE CASCADE ON UPDATE CASCADE;
-
-
-DROP TABLE IF EXISTS PROTECTED_BRANCH_REQUIRE_CONTEXT;
-CREATE TABLE PROTECTED_BRANCH_REQUIRE_CONTEXT(
-    USER_NAME VARCHAR(100) NOT NULL,
-    REPOSITORY_NAME VARCHAR(100) NOT NULL,
-    BRANCH VARCHAR(100) NOT NULL,
-    CONTEXT VARCHAR(255) NOT NULL
-);
-
-ALTER TABLE PROTECTED_BRANCH_REQUIRE_CONTEXT ADD CONSTRAINT IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, BRANCH, CONTEXT);
-ALTER TABLE PROTECTED_BRANCH_REQUIRE_CONTEXT ADD CONSTRAINT IDX_PROTECTED_BRANCH_REQUIRE_CONTEXT_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME, BRANCH) REFERENCES PROTECTED_BRANCH (USER_NAME, REPOSITORY_NAME, BRANCH)
-  ON DELETE CASCADE ON UPDATE CASCADE;
--- a/src/main/scala/ScalatraBootstrap.scala
+++ b/src/main/scala/ScalatraBootstrap.scala
@@ -27,10 +27,12 @@ class ScalatraBootstrap extends LifeCycle {
    }

    context.mount(new IndexController, "/")
+    context.mount(new SearchController, "/")
    context.mount(new FileUploadController, "/upload")
    context.mount(new DashboardController, "/*")
    context.mount(new UserManagementController, "/*")
    context.mount(new SystemSettingsController, "/*")
+    context.mount(new PluginsController, "/*")
    context.mount(new AccountController, "/*")
    context.mount(new RepositoryViewerController, "/*")
    context.mount(new WikiController, "/*")
--- a/src/main/scala/gitbucket/core/api/ApiBranch.scala
+++ b/src/main/scala/gitbucket/core/api/ApiBranch.scala
@@ -1,16 +0,0 @@
-package gitbucket.core.api
-
-import gitbucket.core.util.RepositoryName
-
-/**
- * https://developer.github.com/v3/repos/#get-branch
- * https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection
- */
-case class ApiBranch(
-  name: String,
-  // commit: ApiBranchCommit,
-  protection: ApiBranchProtection)(repositoryName:RepositoryName) extends FieldSerializable {
-  def _links = Map(
-   "self" -> ApiPath(s"/api/v3/repos/${repositoryName.fullName}/branches/${name}"),
-   "html" -> ApiPath(s"/${repositoryName.fullName}/tree/${name}"))
-}
--- a/src/main/scala/gitbucket/core/api/ApiBranchProtection.scala
+++ b/src/main/scala/gitbucket/core/api/ApiBranchProtection.scala
@@ -1,47 +0,0 @@
-package gitbucket.core.api
-
-import gitbucket.core.service.ProtectedBranchService
-import org.json4s._
-
-/** https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection */
-case class ApiBranchProtection(enabled: Boolean, required_status_checks: Option[ApiBranchProtection.Status]){
-  def status: ApiBranchProtection.Status = required_status_checks.getOrElse(ApiBranchProtection.statusNone)
-}
-
-object ApiBranchProtection{
-  /** form for enabling-and-disabling-branch-protection */
-  case class EnablingAndDisabling(protection: ApiBranchProtection)
-
-  def apply(info: ProtectedBranchService.ProtectedBranchInfo): ApiBranchProtection = ApiBranchProtection(
-    enabled = info.enabled,
-    required_status_checks = Some(Status(EnforcementLevel(info.enabled, info.includeAdministrators), info.contexts)))
-  val statusNone = Status(Off, Seq.empty)
-  case class Status(enforcement_level: EnforcementLevel, contexts: Seq[String])
-  sealed class EnforcementLevel(val name: String)
-  case object Off extends EnforcementLevel("off")
-  case object NonAdmins extends EnforcementLevel("non_admins")
-  case object Everyone extends EnforcementLevel("everyone")
-  object EnforcementLevel {
-    def apply(enabled: Boolean, includeAdministrators: Boolean): EnforcementLevel = if(enabled){
-      if(includeAdministrators){
-        Everyone
-      }else{
-        NonAdmins
-      }
-    }else{
-      Off
-    }
-  }
-
-  implicit val enforcementLevelSerializer = new CustomSerializer[EnforcementLevel](format => (
-   {
-     case JString("off") => Off
-     case JString("non_admins") => NonAdmins
-     case JString("everyone") => Everyone
-   },
-   {
-     case x: EnforcementLevel => JString(x.name)
-   }
- ))
-}
-
--- a/src/main/scala/gitbucket/core/api/ApiLabel.scala
+++ b/src/main/scala/gitbucket/core/api/ApiLabel.scala
@@ -1,21 +0,0 @@
-package gitbucket.core.api
-
-import gitbucket.core.model.Label
-import gitbucket.core.util.RepositoryName
-
-/**
-  * https://developer.github.com/v3/issues/labels/
-  */
-case class ApiLabel(
-  name: String,
-  color: String)(repositoryName: RepositoryName){
-  var url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/labels/${name}")
-}
-
-object ApiLabel{
-  def apply(label:Label, repositoryName: RepositoryName): ApiLabel =
-    ApiLabel(
-      name = label.labelName,
-      color = label.color
-    )(repositoryName)
-}
--- a/src/main/scala/gitbucket/core/api/CreateALabel.scala
+++ b/src/main/scala/gitbucket/core/api/CreateALabel.scala
@@ -1,18 +0,0 @@
-package gitbucket.core.api
-
-/**
-  * https://developer.github.com/v3/issues/labels/#create-a-label
-  * api form
-  */
-case class CreateALabel(
-    name: String,
-    color: String
-) {
-  def isValid: Boolean = {
-    name.length<=100 &&
-      !name.startsWith("_") &&
-      !name.startsWith("-") &&
-      color.length==6 &&
-      color.matches("[a-fA-F0-9+_.]+")
-  }
-}
--- a/src/main/scala/gitbucket/core/api/JsonFormat.scala
+++ b/src/main/scala/gitbucket/core/api/JsonFormat.scala
@@ -30,9 +30,7 @@ object JsonFormat {
    FieldSerializer[ApiCombinedCommitStatus]() +
    FieldSerializer[ApiPullRequest.Commit]() +
    FieldSerializer[ApiIssue]() +
-    FieldSerializer[ApiComment]() +
-    FieldSerializer[ApiLabel]() +
-    ApiBranchProtection.enforcementLevelSerializer
+    FieldSerializer[ApiComment]()

  def apiPathSerializer(c: Context) = new CustomSerializer[ApiPath](format =>
    (
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -12,7 +12,7 @@ import gitbucket.core.util.Implicits._
 import gitbucket.core.util.StringUtil._
 import gitbucket.core.util._

-import io.github.gitbucket.scalatra.forms._
+import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.dircache.DirCache
@@ -133,7 +133,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
          val members = getGroupMembers(account.userName)
          gitbucket.core.account.html.repositories(account,
            if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
-            getVisibleRepositories(context.loginAccount, Some(userName)),
+            getVisibleRepositories(context.loginAccount, context.baseUrl, Some(userName)),
            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
        }
      }
@@ -366,7 +366,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   */
  post("/new", newRepositoryForm)(usersOnly { form =>
    LockUtil.lock(s"${form.owner}/${form.name}"){
-      if(getRepository(form.owner, form.name).isEmpty){
+      if(getRepository(form.owner, form.name, context.baseUrl).isEmpty){
        createRepository(form.owner, form.name, form.description, form.isPrivate, form.createReadme)
      }

@@ -385,9 +385,9 @@ trait AccountControllerBase extends AccountManagementControllerBase {
      data <- extractFromJsonBody[CreateARepository] if data.isValid
    } yield {
      LockUtil.lock(s"${owner}/${data.name}") {
-        if(getRepository(owner, data.name).isEmpty){
+        if(getRepository(owner, data.name, context.baseUrl).isEmpty){
          createRepository(owner, data.name, data.description, data.`private`, data.auto_init)
-          val repository = getRepository(owner, data.name).get
+          val repository = getRepository(owner, data.name, context.baseUrl).get
          JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(owner).get)))
        } else {
          ApiError(
@@ -409,9 +409,9 @@ trait AccountControllerBase extends AccountManagementControllerBase {
      data <- extractFromJsonBody[CreateARepository] if data.isValid
    } yield {
      LockUtil.lock(s"${groupName}/${data.name}") {
-        if(getRepository(groupName, data.name).isEmpty){
+        if(getRepository(groupName, data.name, context.baseUrl).isEmpty){
          createRepository(groupName, data.name, data.description, data.`private`, data.auto_init)
-          val repository = getRepository(groupName, data.name).get
+          val repository = getRepository(groupName, data.name, context.baseUrl).get
          JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(groupName).get)))
        } else {
          ApiError(
@@ -447,7 +447,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    val accountName   = form.accountName

    LockUtil.lock(s"${accountName}/${repository.name}"){
-      if(getRepository(accountName, repository.name).isDefined ||
+      if(getRepository(accountName, repository.name, baseUrl).isDefined ||
          (accountName != loginUserName && !getGroupsByUserName(loginUserName).contains(accountName))){
        // redirect to the repository if repository already exists
        redirect(s"/${accountName}/${repository.name}")
--- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala
@@ -8,7 +8,7 @@ import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util._

-import io.github.gitbucket.scalatra.forms._
+import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.json4s._
 import org.scalatra._
@@ -28,11 +28,7 @@ abstract class ControllerBase extends ScalatraFilter
  with ClientSideValidationFormSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations
  with SystemSettingsService {

-  implicit val jsonFormats = gitbucket.core.api.JsonFormat.jsonFormats
-
-  before("/api/v3/*") {
-    contentType = formats("json")
-  }
+  implicit val jsonFormats = DefaultFormats

 // TODO Scala 2.11
 //  // Don't set content type via Accept header.
@@ -180,6 +176,7 @@ abstract class ControllerBase extends ScalatraFilter
 * Context object for the current request.
 */
 case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){
+
  val path = settings.baseUrl.getOrElse(request.getContextPath)
  val currentPath = request.getRequestURI.substring(request.getContextPath.length)
  val baseUrl = settings.baseUrl(request)
--- a/src/main/scala/gitbucket/core/controller/DashboardController.scala
+++ b/src/main/scala/gitbucket/core/controller/DashboardController.scala
@@ -94,7 +94,7 @@ trait DashboardControllerBase extends ControllerBase {

    val userName  = context.loginAccount.get.userName
    val condition = getOrCreateCondition(Keys.Session.DashboardIssues, filter, userName)
-    val userRepos = getUserRepositories(userName, true).map(repo => repo.owner -> repo.name)
+    val userRepos = getUserRepositories(userName, context.baseUrl, true).map(repo => repo.owner -> repo.name)
    val page      = IssueSearchCondition.page(request)

    html.issues(
--- a/src/main/scala/gitbucket/core/controller/IndexController.scala
+++ b/src/main/scala/gitbucket/core/controller/IndexController.scala
@@ -2,46 +2,35 @@ package gitbucket.core.controller

 import gitbucket.core.api._
 import gitbucket.core.helper.xml
+import gitbucket.core.html
 import gitbucket.core.model.Account
-import gitbucket.core.service.{RepositoryService, ActivityService, AccountService, RepositorySearchService, IssuesService}
+import gitbucket.core.service.{RepositoryService, ActivityService, AccountService}
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.ControlUtil._
-import gitbucket.core.util.{LDAPUtil, Keys, UsersAuthenticator, ReferrerAuthenticator, StringUtil}
+import gitbucket.core.util.{LDAPUtil, Keys, UsersAuthenticator}

-import io.github.gitbucket.scalatra.forms._
+import jp.sf.amateras.scalatra.forms._


 class IndexController extends IndexControllerBase 
-  with RepositoryService with ActivityService with AccountService with RepositorySearchService with IssuesService
-  with UsersAuthenticator with ReferrerAuthenticator
+  with RepositoryService with ActivityService with AccountService with UsersAuthenticator


 trait IndexControllerBase extends ControllerBase {
-  self: RepositoryService with ActivityService with AccountService with RepositorySearchService
-    with UsersAuthenticator with ReferrerAuthenticator =>
+  self: RepositoryService with ActivityService with AccountService with UsersAuthenticator =>

  case class SignInForm(userName: String, password: String)

-  val signinForm = mapping(
+  val form = mapping(
    "userName" -> trim(label("Username", text(required))),
    "password" -> trim(label("Password", text(required)))
  )(SignInForm.apply)

-  val searchForm = mapping(
-    "query"      -> trim(text(required)),
-    "owner"      -> trim(text(required)),
-    "repository" -> trim(text(required))
-  )(SearchForm.apply)
-
-  case class SearchForm(query: String, owner: String, repository: String)
-
-
  get("/"){
    val loginAccount = context.loginAccount
    if(loginAccount.isEmpty) {
-        gitbucket.core.html.index(getRecentActivities(),
-            getVisibleRepositories(loginAccount, withoutPhysicalInfo = true),
-            loginAccount.map{ account => getUserRepositories(account.userName, withoutPhysicalInfo = true) }.getOrElse(Nil)
+        html.index(getRecentActivities(),
+            getVisibleRepositories(loginAccount, context.baseUrl, withoutPhysicalInfo = true),
+            loginAccount.map{ account => getUserRepositories(account.userName, context.baseUrl, withoutPhysicalInfo = true) }.getOrElse(Nil)
        )
    } else {
        val loginUserName = loginAccount.get.userName
@@ -50,9 +39,9 @@ trait IndexControllerBase extends ControllerBase {
        
        visibleOwnerSet ++= loginUserGroups

-        gitbucket.core.html.index(getRecentActivitiesByOwners(visibleOwnerSet),
-            getVisibleRepositories(loginAccount, withoutPhysicalInfo = true),
-            loginAccount.map{ account => getUserRepositories(account.userName, withoutPhysicalInfo = true) }.getOrElse(Nil) 
+        html.index(getRecentActivitiesByOwners(visibleOwnerSet),
+            getVisibleRepositories(loginAccount, context.baseUrl, withoutPhysicalInfo = true),
+            loginAccount.map{ account => getUserRepositories(account.userName, context.baseUrl, withoutPhysicalInfo = true) }.getOrElse(Nil) 
        )
    }
  }
@@ -62,10 +51,10 @@ trait IndexControllerBase extends ControllerBase {
    if(redirect.isDefined && redirect.get.startsWith("/")){
      flash += Keys.Flash.Redirect -> redirect.get
    }
-    gitbucket.core.html.signin()
+    html.signin()
  }

-  post("/signin", signinForm){ form =>
+  post("/signin", form){ form =>
    authenticate(context.settings, form.userName, form.password) match {
      case Some(account) => signin(account)
      case None          => redirect("/signin")
@@ -130,33 +119,4 @@ trait IndexControllerBase extends ControllerBase {
    // this message is same as github enterprise...
    org.scalatra.NotFound(ApiError("Rate limiting is not enabled."))
  }
-
-  // TODO Move to RepositoryViwerController?
-  post("/search", searchForm){ form =>
-    redirect(s"/${form.owner}/${form.repository}/search?q=${StringUtil.urlEncode(form.query)}")
-  }
-
-  // TODO Move to RepositoryViwerController?
-  get("/:owner/:repository/search")(referrersOnly { repository =>
-    defining(params("q").trim, params.getOrElse("type", "code")){ case (query, target) =>
-      val page   = try {
-        val i = params.getOrElse("page", "1").toInt
-        if(i <= 0) 1 else i
-      } catch {
-        case e: NumberFormatException => 1
-      }
-
-      target.toLowerCase match {
-        case "issue" => gitbucket.core.search.html.issues(
-          searchIssues(repository.owner, repository.name, query),
-          countFiles(repository.owner, repository.name, query),
-          query, page, repository)
-
-        case _ => gitbucket.core.search.html.code(
-          searchFiles(repository.owner, repository.name, query),
-          countIssues(repository.owner, repository.name, query),
-          query, page, repository)
-      }
-    }
-  })
 }
--- a/src/main/scala/gitbucket/core/controller/IssuesController.scala
+++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala
@@ -11,7 +11,7 @@ import gitbucket.core.util._
 import gitbucket.core.view
 import gitbucket.core.view.Markdown

-import io.github.gitbucket.scalatra.forms._
+import jp.sf.amateras.scalatra.forms._
 import org.scalatra.Ok


--- a/src/main/scala/gitbucket/core/controller/LabelsController.scala
+++ b/src/main/scala/gitbucket/core/controller/LabelsController.scala
@@ -1,13 +1,12 @@
 package gitbucket.core.controller

-import gitbucket.core.api.{ApiError, CreateALabel, ApiLabel, JsonFormat}
 import gitbucket.core.issues.labels.html
 import gitbucket.core.service.{RepositoryService, AccountService, IssuesService, LabelsService}
-import gitbucket.core.util.{LockUtil, RepositoryName, ReferrerAuthenticator, CollaboratorsAuthenticator}
+import gitbucket.core.util.{ReferrerAuthenticator, CollaboratorsAuthenticator}
 import gitbucket.core.util.Implicits._
-import io.github.gitbucket.scalatra.forms._
+import jp.sf.amateras.scalatra.forms._
 import org.scalatra.i18n.Messages
-import org.scalatra.{NoContent, UnprocessableEntity, Created, Ok}
+import org.scalatra.Ok

 class LabelsController extends LabelsControllerBase
  with LabelsService with IssuesService with RepositoryService with AccountService
@@ -20,7 +19,7 @@ trait LabelsControllerBase extends ControllerBase {
  case class LabelForm(labelName: String, color: String)

  val labelForm = mapping(
-    "labelName"  -> trim(label("Label name", text(required, labelName, uniqueLabelName, maxlength(100)))),
+    "labelName"  -> trim(label("Label name", text(required, labelName, maxlength(100)))),
    "labelColor" -> trim(label("Color",      text(required, color)))
  )(LabelForm.apply)

@@ -32,26 +31,6 @@ trait LabelsControllerBase extends ControllerBase {
      hasWritePermission(repository.owner, repository.name, context.loginAccount))
  })

-  /**
-    * List all labels for this repository
-    * https://developer.github.com/v3/issues/labels/#list-all-labels-for-this-repository
-    */
-  get("/api/v3/repos/:owner/:repository/labels")(referrersOnly { repository =>
-    JsonFormat(getLabels(repository.owner, repository.name).map { label =>
-      ApiLabel(label, RepositoryName(repository))
-    })
-  })
-
-  /**
-    * Get a single label
-    * https://developer.github.com/v3/issues/labels/#get-a-single-label
-    */
-  get("/api/v3/repos/:owner/:repository/labels/:labelName")(referrersOnly { repository =>
-    getLabel(repository.owner, repository.name, params("labelName")).map { label =>
-      JsonFormat(ApiLabel(label, RepositoryName(repository)))
-    } getOrElse NotFound()
-  })
-
  ajaxGet("/:owner/:repository/issues/labels/new")(collaboratorsOnly { repository =>
    html.edit(None, repository)
  })
@@ -66,31 +45,6 @@ trait LabelsControllerBase extends ControllerBase {
      hasWritePermission(repository.owner, repository.name, context.loginAccount))
  })

-  /**
-    * Create a label
-    * https://developer.github.com/v3/issues/labels/#create-a-label
-    */
-  post("/api/v3/repos/:owner/:repository/labels")(collaboratorsOnly { repository =>
-    (for{
-      data <- extractFromJsonBody[CreateALabel] if data.isValid
-    } yield {
-      LockUtil.lock(RepositoryName(repository).fullName) {
-        if (getLabel(repository.owner, repository.name, data.name).isEmpty) {
-          val labelId = createLabel(repository.owner, repository.name, data.name, data.color)
-          getLabel(repository.owner, repository.name, labelId).map { label =>
-            Created(JsonFormat(ApiLabel(label, RepositoryName(repository))))
-          } getOrElse NotFound()
-        } else {
-          // TODO ApiError should support errors field to enhance compatibility of GitHub API
-          UnprocessableEntity(ApiError(
-            "Validation Failed",
-            Some("https://developer.github.com/v3/issues/labels/#create-a-label")
-          ))
-        }
-      }
-    }) getOrElse NotFound()
-  })
-
  ajaxGet("/:owner/:repository/issues/labels/:labelId/edit")(collaboratorsOnly { repository =>
    getLabel(repository.owner, repository.name, params("labelId").toInt).map { label =>
      html.edit(Some(label), repository)
@@ -107,50 +61,11 @@ trait LabelsControllerBase extends ControllerBase {
      hasWritePermission(repository.owner, repository.name, context.loginAccount))
  })

-  /**
-    * Update a label
-    * https://developer.github.com/v3/issues/labels/#update-a-label
-    */
-  patch("/api/v3/repos/:owner/:repository/labels/:labelName")(collaboratorsOnly { repository =>
-    (for{
-      data <- extractFromJsonBody[CreateALabel] if data.isValid
-    } yield {
-      LockUtil.lock(RepositoryName(repository).fullName) {
-        getLabel(repository.owner, repository.name, params("labelName")).map { label =>
-          if (getLabel(repository.owner, repository.name, data.name).isEmpty) {
-            updateLabel(repository.owner, repository.name, label.labelId, data.name, data.color)
-            JsonFormat(ApiLabel(
-              getLabel(repository.owner, repository.name, label.labelId).get,
-              RepositoryName(repository)))
-          } else {
-            // TODO ApiError should support errors field to enhance compatibility of GitHub API
-            UnprocessableEntity(ApiError(
-              "Validation Failed",
-              Some("https://developer.github.com/v3/issues/labels/#create-a-label")))
-          }
-        } getOrElse NotFound()
-      }
-    }) getOrElse NotFound()
-  })
-
  ajaxPost("/:owner/:repository/issues/labels/:labelId/delete")(collaboratorsOnly { repository =>
    deleteLabel(repository.owner, repository.name, params("labelId").toInt)
    Ok()
  })

-  /**
-    * Delete a label
-    * https://developer.github.com/v3/issues/labels/#delete-a-label
-    */
-  delete("/api/v3/repos/:owner/:repository/labels/:labelName")(collaboratorsOnly { repository =>
-    LockUtil.lock(RepositoryName(repository).fullName) {
-      getLabel(repository.owner, repository.name, params("labelName")).map { label =>
-        deleteLabel(repository.owner, repository.name, label.labelId)
-        NoContent()
-      } getOrElse NotFound()
-    }
-  })
-
  /**
   * Constraint for the identifier such as user name, repository name or page name.
   */
@@ -165,12 +80,4 @@ trait LabelsControllerBase extends ControllerBase {
      }
  }

-  private def uniqueLabelName: Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] = {
-      val owner = params("owner")
-      val repository = params("repository")
-      getLabel(owner, repository, value).map(_ => "Name has already been taken.")
-    }
-  }
-
 }
--- a/src/main/scala/gitbucket/core/controller/MilestonesController.scala
+++ b/src/main/scala/gitbucket/core/controller/MilestonesController.scala
@@ -4,7 +4,7 @@ import gitbucket.core.issues.milestones.html
 import gitbucket.core.service.{RepositoryService, MilestonesService, AccountService}
 import gitbucket.core.util.{ReferrerAuthenticator, CollaboratorsAuthenticator}
 import gitbucket.core.util.Implicits._
-import io.github.gitbucket.scalatra.forms._
+import jp.sf.amateras.scalatra.forms._

 class MilestonesController extends MilestonesControllerBase
  with MilestonesService with RepositoryService with AccountService
--- a/src/main/scala/gitbucket/core/controller/PluginsController.scala
+++ b/src/main/scala/gitbucket/core/controller/PluginsController.scala
@@ -0,0 +1,11 @@
+package gitbucket.core.controller
+
+import gitbucket.core.admin.plugins.html
+import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.util.AdminAuthenticator
+
+class PluginsController extends ControllerBase with AdminAuthenticator {
+  get("/admin/plugins")(adminOnly {
+    html.plugins(PluginRegistry().getPlugins())
+  })
+}
--- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
+++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
@@ -1,7 +1,7 @@
 package gitbucket.core.controller

 import gitbucket.core.api._
-import gitbucket.core.model.{Account, CommitStatus, CommitState, Repository, PullRequest, Issue, WebHook}
+import gitbucket.core.model.{Account, CommitState, Repository, PullRequest, Issue}
 import gitbucket.core.pulls.html
 import gitbucket.core.service.CommitStatusService
 import gitbucket.core.service.MergeService
@@ -16,7 +16,7 @@ import gitbucket.core.util._
 import gitbucket.core.view
 import gitbucket.core.view.helpers

-import io.github.gitbucket.scalatra.forms._
+import jp.sf.amateras.scalatra.forms._
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.PersonIdent
 import org.slf4j.LoggerFactory
@@ -27,13 +27,13 @@ import scala.collection.JavaConverters._
 class PullRequestsController extends PullRequestsControllerBase
  with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with LabelsService
  with CommitsService with ActivityService with WebHookPullRequestService with ReferrerAuthenticator with CollaboratorsAuthenticator
-  with CommitStatusService with MergeService with ProtectedBranchService
+  with CommitStatusService with MergeService


 trait PullRequestsControllerBase extends ControllerBase {
  self: RepositoryService with AccountService with IssuesService with MilestonesService with LabelsService
    with CommitsService with ActivityService with PullRequestService with WebHookPullRequestService with ReferrerAuthenticator with CollaboratorsAuthenticator
-    with CommitStatusService with MergeService with ProtectedBranchService =>
+    with CommitStatusService with MergeService =>

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

@@ -119,8 +119,7 @@ trait PullRequestsControllerBase extends ControllerBase {
            commits,
            diffs,
            hasWritePermission(owner, name, context.loginAccount),
-            repository,
-            flash.toMap.map(f => f._1 -> f._2.toString))
+            repository)
        }
      }
    } getOrElse NotFound
@@ -137,7 +136,7 @@ trait PullRequestsControllerBase extends ControllerBase {
      baseOwner <- users.get(repository.owner)
      headOwner <- users.get(pullRequest.requestUserName)
      issueUser <- users.get(issue.openedUserName)
-      headRepo  <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
+      headRepo  <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName, baseUrl)
    } yield {
      JsonFormat(ApiPullRequest(
        issue,
@@ -167,36 +166,24 @@ trait PullRequestsControllerBase extends ControllerBase {
    } getOrElse NotFound
  })

-  ajaxGet("/:owner/:repository/pull/:id/mergeguide")(referrersOnly { repository =>
+  ajaxGet("/:owner/:repository/pull/:id/mergeguide")(collaboratorsOnly { repository =>
    params("id").toIntOpt.flatMap{ issueId =>
      val owner = repository.owner
      val name  = repository.name
      getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
-        val hasConflict = LockUtil.lock(s"${owner}/${name}"){
+        val statuses = getCommitStatues(owner, name, pullreq.commitIdTo)
+        val hasConfrict = LockUtil.lock(s"${owner}/${name}"){
          checkConflict(owner, name, pullreq.branch, issueId)
        }
-        val hasMergePermission = hasWritePermission(owner, name, context.loginAccount)
-        val branchProtection = getProtectedBranchInfo(owner, name, pullreq.branch)
-        val mergeStatus = PullRequestService.MergeStatus(
-           hasConflict         = hasConflict,
-           commitStatues       = getCommitStatues(owner, name, pullreq.commitIdTo),
-           branchProtection    = branchProtection,
-           branchIsOutOfDate   = JGitUtil.getShaByRef(owner, name, pullreq.branch) != Some(pullreq.commitIdFrom),
-           needStatusCheck     = context.loginAccount.map{ u =>
-                                   branchProtection.needStatusCheck(u.userName)
-                                 }.getOrElse(true),
-           hasUpdatePermission = hasWritePermission(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount) &&
-                                   context.loginAccount.map{ u =>
-                                     !getProtectedBranchInfo(pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch).needStatusCheck(u.userName)
-                                   }.getOrElse(false),
-           hasMergePermission  = hasMergePermission,
-           commitIdTo          = pullreq.commitIdTo)
+        val hasProblem = hasConfrict || (!statuses.isEmpty && CommitState.combine(statuses.map(_.state).toSet) != CommitState.SUCCESS)
        html.mergeguide(
-          mergeStatus,
+          hasConfrict,
+          hasProblem,
          issue,
          pullreq,
+          statuses,
          repository,
-          getRepository(pullreq.requestUserName, pullreq.requestRepositoryName).get)
+          getRepository(pullreq.requestUserName, pullreq.requestRepositoryName, context.baseUrl).get)
      }
    } getOrElse NotFound
  })
@@ -216,75 +203,6 @@ trait PullRequestsControllerBase extends ControllerBase {
    } getOrElse NotFound
  })

-  post("/:owner/:repository/pull/:id/update_branch")(referrersOnly { baseRepository =>
-    (for {
-      issueId <- params("id").toIntOpt
-      loginAccount <- context.loginAccount
-      (issue, pullreq) <- getPullRequest(baseRepository.owner, baseRepository.name, issueId)
-      owner = pullreq.requestUserName
-      name  = pullreq.requestRepositoryName
-      if hasWritePermission(owner, name, context.loginAccount)
-    } yield {
-      val branchProtection = getProtectedBranchInfo(owner, name, pullreq.requestBranch)
-      if(branchProtection.needStatusCheck(loginAccount.userName)){
-        flash += "error" -> s"branch ${pullreq.requestBranch} is protected need status check."
-      } else {
-        val repository = getRepository(owner, name).get
-        LockUtil.lock(s"${owner}/${name}"){
-          val alias = if(pullreq.repositoryName == pullreq.requestRepositoryName && pullreq.userName == pullreq.requestUserName){
-            pullreq.branch
-          }else{
-            s"${pullreq.userName}:${pullreq.branch}"
-          }
-          val existIds = using(Git.open(Directory.getRepositoryDir(owner, name))) { git => JGitUtil.getAllCommitIds(git) }.toSet
-          pullRemote(owner, name, pullreq.requestBranch, pullreq.userName, pullreq.repositoryName, pullreq.branch, loginAccount,
-                     "Merge branch '${alias}' into ${pullreq.requestBranch}") match {
-            case None => // conflict
-              flash += "error" -> s"Can't automatic merging branch '${alias}' into ${pullreq.requestBranch}."
-            case Some(oldId) =>
-              // update pull request
-              updatePullRequests(owner, name, pullreq.requestBranch)
-
-              using(Git.open(Directory.getRepositoryDir(owner, name))) { git =>
-                //  after update branch
-
-                val newCommitId = git.getRepository.resolve(s"refs/heads/${pullreq.requestBranch}")
-                val commits = git.log.addRange(oldId, newCommitId).call.iterator.asScala.map(c => new JGitUtil.CommitInfo(c)).toList
-
-                commits.foreach{ commit =>
-                  if(!existIds.contains(commit.id)){
-                    createIssueComment(owner, name, commit)
-                  }
-                }
-
-                // record activity
-                recordPushActivity(owner, name, loginAccount.userName, pullreq.branch, commits)
-
-                // close issue by commit message
-                if(pullreq.requestBranch == repository.repository.defaultBranch){
-                  commits.map{ commit =>
-                    closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
-                  }
-                }
-
-                // call web hook
-                callPullRequestWebHookByRequestBranch("synchronize", repository, pullreq.requestBranch, baseUrl, loginAccount)
-                callWebHookOf(owner, name, WebHook.Push) {
-                  for {
-                    ownerAccount <- getAccountByUserName(owner)
-                  } yield {
-                    WebHookService.WebHookPushPayload(git, loginAccount, pullreq.requestBranch, repository, commits, ownerAccount, oldId = oldId, newId = newCommitId)
-                  }
-                }
-              }
-              flash += "info" -> s"Merge branch '${alias}' into ${pullreq.requestBranch}"
-          }
-        }
-        redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
-      }
-    }) getOrElse NotFound
-  })
-
  post("/:owner/:repository/pull/:id/merge", mergeForm)(collaboratorsOnly { (form, repository) =>
    params("id").toIntOpt.flatMap { issueId =>
      val owner = repository.owner
@@ -310,7 +228,7 @@ trait PullRequestsControllerBase extends ControllerBase {
              pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.commitIdTo)

            // close issue by content of pull request
-            val defaultBranch = getRepository(owner, name).get.repository.defaultBranch
+            val defaultBranch = getRepository(owner, name, context.baseUrl).get.repository.defaultBranch
            if(pullreq.branch == defaultBranch){
              commits.flatten.foreach { commit =>
                closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
@@ -343,7 +261,7 @@ trait PullRequestsControllerBase extends ControllerBase {
    val headBranch:Option[String] = params.get("head")
    (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
      case (Some(originUserName), Some(originRepositoryName)) => {
-        getRepository(originUserName, originRepositoryName).map { originRepository =>
+        getRepository(originUserName, originRepositoryName, context.baseUrl).map { originRepository =>
          using(
            Git.open(getRepositoryDir(originUserName, originRepositoryName)),
            Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
@@ -384,12 +302,12 @@ trait PullRequestsControllerBase extends ControllerBase {
        forkedRepository.repository.originRepositoryName
      } else {
        // Sibling repository
-        getUserRepositories(originOwner).find { x =>
+        getUserRepositories(originOwner, context.baseUrl).find { x =>
          x.repository.originUserName == forkedRepository.repository.originUserName &&
            x.repository.originRepositoryName == forkedRepository.repository.originRepositoryName
        }.map(_.repository.repositoryName)
      };
-      originRepository <- getRepository(originOwner, originRepositoryName)
+      originRepository <- getRepository(originOwner, originRepositoryName, context.baseUrl)
    ) yield {
      using(
        Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
@@ -457,7 +375,7 @@ trait PullRequestsControllerBase extends ControllerBase {
          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
        }
      };
-      originRepository <- getRepository(originOwner, originRepositoryName)
+      originRepository <- getRepository(originOwner, originRepositoryName, context.baseUrl)
    ) yield {
      using(
        Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
@@ -610,15 +528,4 @@ trait PullRequestsControllerBase extends ControllerBase {
        repository,
        hasWritePermission(owner, repoName, context.loginAccount))
    }
-
-  // TODO: same as gitbucket.core.servlet.CommitLogHook ...
-  private def createIssueComment(owner: String, repository: String, commit: CommitInfo) = {
-    StringUtil.extractIssueId(commit.fullMessage).foreach { issueId =>
-      if(getIssue(owner, repository, issueId).isDefined){
-        getAccountByMailAddress(commit.committerEmailAddress).foreach { account =>
-          createComment(owner, repository, account.userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
-        }
-      }
-    }
-  }
 }
--- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
@@ -2,14 +2,14 @@ package gitbucket.core.controller

 import gitbucket.core.settings.html
 import gitbucket.core.model.WebHook
-import gitbucket.core.service.{RepositoryService, AccountService, WebHookService, ProtectedBranchService, CommitStatusService}
+import gitbucket.core.service.{RepositoryService, AccountService, WebHookService}
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.util._
 import gitbucket.core.util.JGitUtil._
 import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
-import io.github.gitbucket.scalatra.forms._
+import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.scalatra.i18n.Messages
 import org.eclipse.jgit.api.Git
@@ -18,29 +18,23 @@ import org.eclipse.jgit.lib.ObjectId


 class RepositorySettingsController extends RepositorySettingsControllerBase
-  with RepositoryService with AccountService with WebHookService with ProtectedBranchService with CommitStatusService
+  with RepositoryService with AccountService with WebHookService
  with OwnerAuthenticator with UsersAuthenticator

 trait RepositorySettingsControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with WebHookService with ProtectedBranchService with CommitStatusService
+  self: RepositoryService with AccountService with WebHookService
    with OwnerAuthenticator with UsersAuthenticator =>

  // for repository options
-  case class OptionsForm(repositoryName: String, description: Option[String], isPrivate: Boolean)
+  case class OptionsForm(repositoryName: String, description: Option[String], defaultBranch: String, isPrivate: Boolean)
  
  val optionsForm = mapping(
    "repositoryName" -> trim(label("Repository Name", 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 default branch
-  case class DefaultBranchForm(defaultBranch: String)
-
-  val defaultBranchForm = mapping(
-    "defaultBranch"  -> trim(label("Default Branch" , text(required, maxlength(100))))
-  )(DefaultBranchForm.apply)
-
  // for collaborator addition
  case class CollaboratorForm(userName: String)

@@ -81,10 +75,12 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   * Save the repository options.
   */
  post("/:owner/:repository/settings/options", optionsForm)(ownerOnly { (form, repository) =>
+    val defaultBranch = if(repository.branchList.isEmpty) "master" else form.defaultBranch
    saveRepositoryOptions(
      repository.owner,
      repository.name,
      form.description,
+      defaultBranch,
      repository.repository.parentUserName.map { _ =>
        repository.repository.isPrivate
      } getOrElse form.isPrivate
@@ -102,61 +98,14 @@ trait RepositorySettingsControllerBase extends ControllerBase {
        FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
      }
    }
+    // Change repository HEAD
+    using(Git.open(getRepositoryDir(repository.owner, form.repositoryName))) { git =>
+      git.getRepository.updateRef(Constants.HEAD, true).link(Constants.R_HEADS + defaultBranch)
+    }
    flash += "info" -> "Repository settings has been updated."
    redirect(s"/${repository.owner}/${form.repositoryName}/settings/options")
  })
-
-  /** branch settings */
-  get("/:owner/:repository/settings/branches")(ownerOnly { repository =>
-    val protecteions = getProtectedBranchList(repository.owner, repository.name)
-    html.branches(repository, protecteions, flash.get("info"))
-  });
-
-  /** Update default branch */
-  post("/:owner/:repository/settings/update_default_branch", defaultBranchForm)(ownerOnly { (form, repository) =>
-    if(repository.branchList.find(_ == form.defaultBranch).isEmpty){
-      redirect(s"/${repository.owner}/${repository.name}/settings/options")
-    } else {
-      saveRepositoryDefaultBranch(repository.owner, repository.name, form.defaultBranch)
-      // Change repository HEAD
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-        git.getRepository.updateRef(Constants.HEAD, true).link(Constants.R_HEADS + form.defaultBranch)
-      }
-      flash += "info" -> "Repository default branch has been updated."
-      redirect(s"/${repository.owner}/${repository.name}/settings/branches")
-    }
-  })
-
-  /** Branch protection for branch */
-  get("/:owner/:repository/settings/branches/:branch")(ownerOnly { repository =>
-    import gitbucket.core.api._
-    val branch = params("branch")
-    if(repository.branchList.find(_ == branch).isEmpty){
-      redirect(s"/${repository.owner}/${repository.name}/settings/branches")
-    } else {
-      val protection = ApiBranchProtection(getProtectedBranchInfo(repository.owner, repository.name, branch))
-      val lastWeeks = getRecentStatuesContexts(repository.owner, repository.name, org.joda.time.LocalDateTime.now.minusWeeks(1).toDate).toSet
-      val knownContexts = (lastWeeks ++ protection.status.contexts).toSeq.sortBy(identity)
-      html.branchprotection(repository, branch, protection, knownContexts, flash.get("info"))
-    }
-  })
-
-  /** https://developer.github.com/v3/repos/#enabling-and-disabling-branch-protection */
-  patch("/api/v3/repos/:owner/:repo/branches/:branch")(ownerOnly { repository =>
-    import gitbucket.core.api._
-    (for{
-      branch <- params.get("branch") if repository.branchList.find(_ == branch).isDefined
-      protection <- extractFromJsonBody[ApiBranchProtection.EnablingAndDisabling].map(_.protection)
-    } yield {
-      if(protection.enabled){
-        enableBranchProtection(repository.owner, repository.name, branch, protection.status.enforcement_level == ApiBranchProtection.Everyone, protection.status.contexts)
-      } else {
-        disableBranchProtection(repository.owner, repository.name, branch)
-      }
-      JsonFormat(ApiBranch(branch, protection)(RepositoryName(repository)))
-    }) getOrElse NotFound
-  })
-
+  
  /**
   * Display the Collaborators page.
   */
--- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
@@ -14,11 +14,12 @@ import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
 import gitbucket.core.model.{Account, CommitState, WebHook}
+import gitbucket.core.service.CommitStatusService
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.view
 import gitbucket.core.view.helpers

-import io.github.gitbucket.scalatra.forms._
+import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.api.{ArchiveCommand, Git}
 import org.eclipse.jgit.archive.{TgzFormat, ZipFormat}
@@ -33,7 +34,7 @@ import org.scalatra._
 class RepositoryViewerController extends RepositoryViewerControllerBase
  with RepositoryService with AccountService with ActivityService with IssuesService with WebHookService with CommitsService
  with ReadableUsersAuthenticator with ReferrerAuthenticator with CollaboratorsAuthenticator with PullRequestService with CommitStatusService
-  with WebHookPullRequestService with WebHookPullRequestReviewCommentService with ProtectedBranchService
+  with WebHookPullRequestService with WebHookPullRequestReviewCommentService

 /**
 * The repository viewer.
@@ -41,7 +42,7 @@ class RepositoryViewerController extends RepositoryViewerControllerBase
 trait RepositoryViewerControllerBase extends ControllerBase {
  self: RepositoryService with AccountService with ActivityService with IssuesService with WebHookService with CommitsService
    with ReadableUsersAuthenticator with ReferrerAuthenticator with CollaboratorsAuthenticator with PullRequestService with CommitStatusService
-    with WebHookPullRequestService with WebHookPullRequestReviewCommentService with ProtectedBranchService =>
+    with WebHookPullRequestService with WebHookPullRequestReviewCommentService =>

  ArchiveCommand.registerFormat("zip", new ZipFormat)
  ArchiveCommand.registerFormat("tar.gz", new TgzFormat)
@@ -110,7 +111,6 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      enableRefsLink = params("enableRefsLink").toBoolean,
      enableLineBreaks = params("enableLineBreaks").toBoolean,
      enableTaskList = params("enableTaskList").toBoolean,
-      enableAnchor = false,
      hasWritePermission = hasWritePermission(repository.owner, repository.name, context.loginAccount)
    )
  })
@@ -221,15 +221,12 @@ trait RepositoryViewerControllerBase extends ControllerBase {

  get("/:owner/:repository/new/*")(collaboratorsOnly { repository =>
    val (branch, path) = splitPath(repository, multiParams("splat").head)
-    val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)
    html.editor(branch, repository, if(path.length == 0) Nil else path.split("/").toList,
-      None, JGitUtil.ContentInfo("text", None, Some("UTF-8")),
-      protectedBranch)
+      None, JGitUtil.ContentInfo("text", None, Some("UTF-8")))
  })

  get("/:owner/:repository/edit/*")(collaboratorsOnly { repository =>
    val (branch, path) = splitPath(repository, multiParams("splat").head)
-    val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch).needStatusCheck(context.loginAccount.get.userName)

    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
@@ -237,8 +234,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      getPathObjectId(git, path, revCommit).map { objectId =>
        val paths = path.split("/")
        html.editor(branch, repository, paths.take(paths.size - 1).toList, Some(paths.last),
-          JGitUtil.getContentInfo(git, path, objectId),
-          protectedBranch)
+          JGitUtil.getContentInfo(git, path, objectId))
      } getOrElse NotFound
    }
  })
@@ -307,7 +303,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
      getPathObjectId(git, path, revCommit).flatMap { objectId =>
        JGitUtil.getObjectLoaderFromId(git, objectId){ loader =>
-          contentType = FileUtil.getMimeType(path)
+          contentType = "application/octet-stream"
          response.setContentLength(loader.getSize.toInt)
          loader.copyTo(response.outputStream)
          ()
@@ -328,7 +324,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        if(raw){
          // Download (This route is left for backword compatibility)
          JGitUtil.getObjectLoaderFromId(git, objectId){ loader =>
-            contentType = FileUtil.getMimeType(path)
+            contentType = "application/octet-stream"
            response.setContentLength(loader.getSize.toInt)
            loader.copyTo(response.outputStream)
            ()
@@ -489,7 +485,6 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   * Displays branches.
   */
  get("/:owner/:repository/branches")(referrersOnly { repository =>
-    val protectedBranches = getProtectedBranchList(repository.owner, repository.name).toSet
    val branches = JGitUtil.getBranches(
      owner         = repository.owner,
      name          = repository.name,
@@ -497,7 +492,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      origin        = repository.repository.originUserName.isEmpty
    )
    .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
-    .map(br => (br, getPullRequestByRequestCommit(repository.owner, repository.name, repository.repository.defaultBranch, br.name, br.commitId), protectedBranches.contains(br.name)))
+    .map(br => br -> getPullRequestByRequestCommit(repository.owner, repository.name, repository.repository.defaultBranch, br.name, br.commitId))
    .reverse

    html.branches(branches, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository)
@@ -560,7 +555,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    html.forked(
      getRepository(
        repository.repository.originUserName.getOrElse(repository.owner),
-        repository.repository.originRepositoryName.getOrElse(repository.name)),
+        repository.repository.originRepositoryName.getOrElse(repository.name),
+        context.baseUrl),
      getForkedRepositories(
        repository.repository.originUserName.getOrElse(repository.owner),
        repository.repository.originRepositoryName.getOrElse(repository.name)),
@@ -633,7 +629,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            val parentPath = if (path == ".") Nil else path.split("/").toList
            // process README.md or README.markdown
            val readme = files.find { file =>
-              !file.isDirectory && readmeFiles.contains(file.name.toLowerCase)
+              readmeFiles.contains(file.name.toLowerCase)
            }.map { file =>
              val path = (file.name :: parentPath.reverse).reverse
              path -> StringUtil.convertFromByteArray(JGitUtil.getContentFromId(
@@ -687,7 +683,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          headName, loginAccount.fullName, loginAccount.mailAddress, message)

        inserter.flush()
-        inserter.close()
+        inserter.release()

        // update refs
        val refUpdate = git.getRepository.updateRef(headName)
@@ -758,6 +754,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         .setTree(revCommit.getTree)
         .setOutputStream(response.getOutputStream)
         .call()
+
+      Unit
    }
  }

--- a/src/main/scala/gitbucket/core/controller/SearchController.scala
+++ b/src/main/scala/gitbucket/core/controller/SearchController.scala
@@ -0,0 +1,51 @@
+package gitbucket.core.controller
+
+import gitbucket.core.search.html
+import gitbucket.core.service._
+import gitbucket.core.util.{StringUtil, ControlUtil, ReferrerAuthenticator, Implicits}
+import ControlUtil._
+import Implicits._
+import jp.sf.amateras.scalatra.forms._
+
+class SearchController extends SearchControllerBase
+  with RepositoryService with AccountService with ActivityService with RepositorySearchService with IssuesService with ReferrerAuthenticator
+
+trait SearchControllerBase extends ControllerBase { self: RepositoryService
+  with ActivityService with RepositorySearchService with ReferrerAuthenticator =>
+
+  val searchForm = mapping(
+    "query"      -> trim(text(required)),
+    "owner"      -> trim(text(required)),
+    "repository" -> trim(text(required))
+  )(SearchForm.apply)
+
+  case class SearchForm(query: String, owner: String, repository: String)
+
+  post("/search", searchForm){ form =>
+    redirect(s"/${form.owner}/${form.repository}/search?q=${StringUtil.urlEncode(form.query)}")
+  }
+
+  get("/:owner/:repository/search")(referrersOnly { repository =>
+    defining(params("q").trim, params.getOrElse("type", "code")){ case (query, target) =>
+      val page   = try {
+        val i = params.getOrElse("page", "1").toInt
+        if(i <= 0) 1 else i
+      } catch {
+        case e: NumberFormatException => 1
+      }
+
+      target.toLowerCase match {
+        case "issue" => html.issues(
+          searchIssues(repository.owner, repository.name, query),
+          countFiles(repository.owner, repository.name, query),
+          query, page, repository)
+
+        case _ => html.code(
+          searchFiles(repository.owner, repository.name, query),
+          countIssues(repository.owner, repository.name, query),
+          query, page, repository)
+      }
+    }
+  })
+
+}
--- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
@@ -4,9 +4,8 @@ import gitbucket.core.admin.html
 import gitbucket.core.service.{AccountService, SystemSettingsService}
 import gitbucket.core.util.AdminAuthenticator
 import gitbucket.core.ssh.SshServer
-import gitbucket.core.plugin.PluginRegistry
 import SystemSettingsService._
-import io.github.gitbucket.scalatra.forms._
+import jp.sf.amateras.scalatra.forms._

 class SystemSettingsController extends SystemSettingsControllerBase
  with AccountService with AdminAuthenticator
@@ -24,7 +23,6 @@ trait SystemSettingsControllerBase extends ControllerBase {
    "notification"             -> trim(label("Notification", boolean())),
    "activityLogLimit"         -> trim(label("Limit of activity logs", optional(number()))),
    "ssh"                      -> trim(label("SSH access", boolean())),
-    "sshHost"                  -> trim(label("SSH host", optional(text()))),
    "sshPort"                  -> trim(label("SSH port", optional(number()))),
    "useSMTP"                  -> trim(label("SMTP", boolean())),
    "smtp"                     -> optionalIfNotChecked("useSMTP", mapping(
@@ -52,14 +50,9 @@ trait SystemSettingsControllerBase extends ControllerBase {
        "keystore"                 -> trim(label("Keystore", optional(text())))
    )(Ldap.apply))
  )(SystemSettings.apply).verifying { settings =>
-    Vector(
-      if(settings.ssh && settings.baseUrl.isEmpty){
-        Some("baseUrl" -> "Base URL is required if SSH access is enabled.")
-      } else None,
-      if(settings.ssh && settings.sshHost.isEmpty){
-        Some("sshHost" -> "SSH host is required if SSH access is enabled.")
-      } else None
-    ).flatten
+    if(settings.ssh && settings.baseUrl.isEmpty){
+      Seq("baseUrl" -> "Base URL is required if SSH access is enabled.")
+    } else Nil
  }

  private val pluginForm = mapping(
@@ -75,21 +68,20 @@ trait SystemSettingsControllerBase extends ControllerBase {
  post("/admin/system", form)(adminOnly { form =>
    saveSystemSettings(form)

-    if (form.sshAddress != context.settings.sshAddress) {
+    if(form.ssh && SshServer.isActive && context.settings.sshPort != form.sshPort){
+      SshServer.stop()
+    }
+
+    if(form.ssh && !SshServer.isActive && form.baseUrl.isDefined){
+      SshServer.start(
+        form.sshPort.getOrElse(SystemSettingsService.DefaultSshPort),
+        form.baseUrl.get)
+    } else if(!form.ssh && SshServer.isActive){
      SshServer.stop()
-       for {
-         sshAddress <- form.sshAddress
-         baseUrl    <- form.baseUrl
-       }
-       SshServer.start(sshAddress, baseUrl)
    }

    flash += "info" -> "System settings has been updated."
    redirect("/admin/system")
  })

-  get("/admin/plugins")(adminOnly {
-    html.plugins(PluginRegistry().getPlugins())
-  })
-
 }
--- a/src/main/scala/gitbucket/core/controller/UserManagementController.scala
+++ b/src/main/scala/gitbucket/core/controller/UserManagementController.scala
@@ -7,7 +7,7 @@ import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
-import io.github.gitbucket.scalatra.forms._
+import jp.sf.amateras.scalatra.forms._
 import org.scalatra.i18n.Messages
 import org.apache.commons.io.FileUtils

--- a/src/main/scala/gitbucket/core/controller/WikiController.scala
+++ b/src/main/scala/gitbucket/core/controller/WikiController.scala
@@ -7,7 +7,7 @@ import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
-import io.github.gitbucket.scalatra.forms._
+import jp.sf.amateras.scalatra.forms._
 import org.eclipse.jgit.api.Git
 import org.scalatra.i18n.Messages

@@ -38,9 +38,7 @@ trait WikiControllerBase extends ControllerBase {
  get("/:owner/:repository/wiki")(referrersOnly { repository =>
    getWikiPage(repository.owner, repository.name, "Home").map { page =>
      html.page("Home", page, getWikiPageList(repository.owner, repository.name),
-        repository, hasWritePermission(repository.owner, repository.name, context.loginAccount),
-        getWikiPage(repository.owner, repository.name, "_Sidebar"),
-        getWikiPage(repository.owner, repository.name, "_Footer"))
+        repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit")
  })
  
@@ -49,9 +47,7 @@ trait WikiControllerBase extends ControllerBase {

    getWikiPage(repository.owner, repository.name, pageName).map { page =>
      html.page(pageName, page, getWikiPageList(repository.owner, repository.name),
-        repository, hasWritePermission(repository.owner, repository.name, context.loginAccount),
-        getWikiPage(repository.owner, repository.name, "_Sidebar"),
-        getWikiPage(repository.owner, repository.name, "_Footer"))
+        repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
  })
  
@@ -128,11 +124,7 @@ trait WikiControllerBase extends ControllerBase {
        updateLastActivityDate(repository.owner, repository.name)
        recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
      }
-      if(notReservedPageName(form.pageName)) {
-        redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
-      } else {
-        redirect(s"/${repository.owner}/${repository.name}/wiki")
-      }
+      redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
    }
  })
  
@@ -148,11 +140,7 @@ trait WikiControllerBase extends ControllerBase {
      updateLastActivityDate(repository.owner, repository.name)
      recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)

-      if(notReservedPageName(form.pageName)) {
-        redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
-      } else {
-        redirect(s"/${repository.owner}/${repository.name}/wiki")
-      }
+      redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
    }
  })
  
@@ -198,15 +186,13 @@ trait WikiControllerBase extends ControllerBase {
    override def validate(name: String, value: String, messages: Messages): Option[String] =
      if(value.exists("\\/:*?\"<>|".contains(_))){
        Some(s"${name} contains invalid character.")
-      } else if(notReservedPageName(value) && (value.startsWith("_") || value.startsWith("-"))){
+      } else if(value.startsWith("_") || value.startsWith("-")){
        Some(s"${name} starts with invalid character.")
      } else {
        None
      }
  }

-  private def notReservedPageName(value: String) = ! (Array[String]("_Sidebar","_Footer") contains value)
-
  private def conflictForNew: Constraint = new Constraint(){
    override def validate(name: String, value: String, messages: Messages): Option[String] = {
      targetWikiPage.map { _ =>
--- a/src/main/scala/gitbucket/core/model/BasicTemplate.scala
+++ b/src/main/scala/gitbucket/core/model/BasicTemplate.scala
@@ -26,16 +26,12 @@ protected[model] trait TemplateComponent { self: Profile =>

  trait LabelTemplate extends BasicTemplate { self: Table[_] =>
    val labelId = column[Int]("LABEL_ID")
-    val labelName = column[String]("LABEL_NAME")

    def byLabel(owner: String, repository: String, labelId: Int) =
      byRepository(owner, repository) && (this.labelId === labelId.bind)

    def byLabel(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) =
      byRepository(userName, repositoryName) && (this.labelId === labelId)
-
-    def byLabel(owner: String, repository: String, labelName: String) =
-      byRepository(owner, repository) && (this.labelName === labelName.bind)
  }

  trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
@@ -58,9 +54,4 @@ protected[model] trait TemplateComponent { self: Profile =>
      byRepository(userName, repositoryName) && (this.commitId === commitId)
  }

-  trait BranchTemplate extends BasicTemplate{ self: Table[_] =>
-    val branch = column[String]("BRANCH")
-    def byBranch(owner: String, repository: String, branchName: String) = byRepository(owner, repository) && (branch === branchName.bind)
-    def byBranch(owner: Column[String], repository: Column[String], branchName: Column[String]) = byRepository(owner, repository) && (this.branch === branchName)
-  }
 }
--- a/src/main/scala/gitbucket/core/model/CommitStatus.scala
+++ b/src/main/scala/gitbucket/core/model/CommitStatus.scala
@@ -19,7 +19,7 @@ trait CommitStatusComponent extends TemplateComponent { self: Profile =>
    val creator = column[String]("CREATOR")
    val registeredDate = column[java.util.Date]("REGISTERED_DATE")
    val updatedDate = column[java.util.Date]("UPDATED_DATE")
-    def * = (commitStatusId, userName, repositoryName, commitId, context, state, targetUrl, description, creator, registeredDate, updatedDate) <> ((CommitStatus.apply _).tupled, CommitStatus.unapply)
+    def * = (commitStatusId, userName, repositoryName, commitId, context, state, targetUrl, description, creator, registeredDate, updatedDate) <> (CommitStatus.tupled, CommitStatus.unapply)
    def byPrimaryKey(id: Int) = commitStatusId === id.bind
  }
 }
@@ -38,20 +38,7 @@ case class CommitStatus(
  registeredDate: java.util.Date,
  updatedDate: java.util.Date
 )
-object CommitStatus {
-  def pending(owner: String, repository: String, context: String) = CommitStatus(
-    commitStatusId = 0,
-    userName = owner,
-    repositoryName = repository,
-    commitId = "",
-    context = context,
-    state = CommitState.PENDING,
-    targetUrl = None,
-    description = Some("Waiting for status to be reported"),
-    creator = "",
-    registeredDate = new java.util.Date(),
-    updatedDate = new java.util.Date())
-}
+

 sealed abstract class CommitState(val name: String)

--- a/src/main/scala/gitbucket/core/model/Labels.scala
+++ b/src/main/scala/gitbucket/core/model/Labels.scala
@@ -7,7 +7,7 @@ trait LabelComponent extends TemplateComponent { self: Profile =>

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

--- a/src/main/scala/gitbucket/core/model/Profile.scala
+++ b/src/main/scala/gitbucket/core/model/Profile.scala
@@ -50,6 +50,5 @@ trait CoreProfile extends ProfileProvider with Profile
  with WebHookComponent
  with WebHookEventComponent
  with PluginComponent
-  with ProtectedBranchComponent

 object Profile extends CoreProfile
--- a/src/main/scala/gitbucket/core/model/ProtectedBranch.scala
+++ b/src/main/scala/gitbucket/core/model/ProtectedBranch.scala
@@ -1,37 +0,0 @@
-package gitbucket.core.model
-
-import scala.slick.lifted.MappedTo
-import scala.slick.jdbc._
-
-trait ProtectedBranchComponent extends TemplateComponent { self: Profile =>
-  import profile.simple._
-  import self._
-
-  lazy val ProtectedBranches = TableQuery[ProtectedBranches]
-  class ProtectedBranches(tag: Tag) extends Table[ProtectedBranch](tag, "PROTECTED_BRANCH") with BranchTemplate {
-    val statusCheckAdmin = column[Boolean]("STATUS_CHECK_ADMIN")
-    def * = (userName, repositoryName, branch, statusCheckAdmin) <> (ProtectedBranch.tupled, ProtectedBranch.unapply)
-    def byPrimaryKey(userName: String, repositoryName: String, branch: String) = byBranch(userName, repositoryName, branch)
-    def byPrimaryKey(userName: Column[String], repositoryName: Column[String], branch: Column[String]) = byBranch(userName, repositoryName, branch)
-  }
-
-  lazy val ProtectedBranchContexts = TableQuery[ProtectedBranchContexts]
-  class ProtectedBranchContexts(tag: Tag) extends Table[ProtectedBranchContext](tag, "PROTECTED_BRANCH_REQUIRE_CONTEXT") with BranchTemplate {
-    val context = column[String]("CONTEXT")
-    def * = (userName, repositoryName, branch, context) <> (ProtectedBranchContext.tupled, ProtectedBranchContext.unapply)
-  }
-}
-
-
-case class ProtectedBranch(
-  userName: String,
-  repositoryName: String,
-  branch: String,
-  statusCheckAdmin: Boolean)
-
-
-case class ProtectedBranchContext(
-  userName: String,
-  repositoryName: String,
-  branch: String,
-  context: String)
--- a/src/main/scala/gitbucket/core/plugin/Plugin.scala
+++ b/src/main/scala/gitbucket/core/plugin/Plugin.scala
@@ -67,16 +67,6 @@ trait Plugin {
   */
  def repositoryRoutings(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[GitRepositoryRouting] = Nil

-  /**
-   * Override to add receive hooks.
-   */
-  val receiveHooks: Seq[ReceiveHook] = Nil
-
-  /**
-   * Override to add receive hooks.
-   */
-  def receiveHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[ReceiveHook] = Nil
-
  /**
   * This method is invoked in initialization of plugin system.
   * Register plugin functionality to PluginRegistry.
@@ -97,9 +87,6 @@ trait Plugin {
    (repositoryRoutings ++ repositoryRoutings(registry, context, settings)).foreach { routing =>
      registry.addRepositoryRouting(routing)
    }
-    (receiveHooks ++ receiveHooks(registry, context, settings)).foreach { receiveHook =>
-      registry.addReceiveHook(receiveHook)
-    }
  }

  /**
--- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
@@ -6,7 +6,6 @@ import javax.servlet.ServletContext
 import javax.servlet.http.{HttpServletRequest, HttpServletResponse}

 import gitbucket.core.controller.{Context, ControllerBase}
-import gitbucket.core.service.ProtectedBranchService.ProtectedBranchReceiveHook
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.core.util.ControlUtil._
@@ -30,8 +29,6 @@ class PluginRegistry {
    "md" -> MarkdownRenderer, "markdown" -> MarkdownRenderer
  )
  private val repositoryRoutings = new ListBuffer[GitRepositoryRouting]
-  private val receiveHooks = new ListBuffer[ReceiveHook]
-  receiveHooks += new ProtectedBranchReceiveHook()

  def addPlugin(pluginInfo: PluginInfo): Unit = {
    plugins += pluginInfo
@@ -101,12 +98,6 @@ class PluginRegistry {
    }
  }

-  def addReceiveHook(commitHook: ReceiveHook): Unit = {
-    receiveHooks += commitHook
-  }
-
-  def getReceiveHooks: Seq[ReceiveHook] = receiveHooks.toSeq
-
  private case class GlobalAction(
    method: String,
    path: String,
@@ -178,7 +169,7 @@ object PluginRegistry {
          ))

        } catch {
-          case e: Throwable => {
+          case e: Exception => {
            logger.error(s"Error during plugin initialization", e)
          }
        }
--- a/src/main/scala/gitbucket/core/plugin/ReceiveHook.scala
+++ b/src/main/scala/gitbucket/core/plugin/ReceiveHook.scala
@@ -1,15 +0,0 @@
-package gitbucket.core.plugin
-
-import gitbucket.core.model.Profile._
-import org.eclipse.jgit.transport.{ReceivePack, ReceiveCommand}
-import profile.simple._
-
-trait ReceiveHook {
-
-  def preReceive(owner: String, repository: String, receivePack: ReceivePack, command: ReceiveCommand, pusher: String)
-                (implicit session: Session): Option[String] = None
-
-  def postReceive(owner: String, repository: String, receivePack: ReceivePack, command: ReceiveCommand, pusher: String)
-                 (implicit session: Session): Unit = ()
-
-}
--- a/src/main/scala/gitbucket/core/service/AccessTokenService.scala
+++ b/src/main/scala/gitbucket/core/service/AccessTokenService.scala
--- a/src/main/scala/gitbucket/core/service/CommitStatusService.scala
+++ b/src/main/scala/gitbucket/core/service/CommitStatusService.scala
@@ -7,51 +7,46 @@ import gitbucket.core.model.{CommitState, CommitStatus, Account}
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.StringUtil._
 import gitbucket.core.service.RepositoryService.RepositoryInfo
-import org.joda.time.LocalDateTime
-import gitbucket.core.model.Profile.dateColumnType
+

 trait CommitStatusService {
  /** insert or update */
-  def createCommitStatus(userName: String, repositoryName: String, sha: String, context: String, state: CommitState,
-                         targetUrl: Option[String], description: Option[String], now: java.util.Date, creator: Account)(implicit s: Session): Int =
-    CommitStatuses
-      .filter(t => t.byCommit(userName, repositoryName, sha) && t.context === context.bind )
+  def createCommitStatus(userName: String, repositoryName: String, sha:String, context:String, state:CommitState, targetUrl:Option[String], description:Option[String], now:java.util.Date, creator:Account)(implicit s: Session): Int =
+    CommitStatuses.filter(t => t.byCommit(userName, repositoryName, sha) && t.context===context.bind )
      .map(_.commitStatusId).firstOption match {
-        case Some(id: Int) => {
-          CommitStatuses.filter(_.byPrimaryKey(id)).map { t =>
-            (t.state , t.targetUrl , t.updatedDate , t.creator, t.description)
-          }.update((state, targetUrl, now, creator.userName, description))
-          id
-        }
-        case None => (CommitStatuses returning CommitStatuses.map(_.commitStatusId)) += CommitStatus(
-            userName       = userName,
-            repositoryName = repositoryName,
-            commitId       = sha,
-            context        = context,
-            state          = state,
-            targetUrl      = targetUrl,
-            description    = description,
-            creator        = creator.userName,
-            registeredDate = now,
-            updatedDate    = now)
+    case Some(id:Int) => {
+      CommitStatuses.filter(_.byPrimaryKey(id)).map{
+        t => (t.state , t.targetUrl , t.updatedDate , t.creator, t.description)
+        }.update( (state, targetUrl, now, creator.userName, description) )
+        id
+      }
+    case None => (CommitStatuses returning CommitStatuses.map(_.commitStatusId)) += CommitStatus(
+        userName       = userName,
+        repositoryName = repositoryName,
+        commitId       = sha,
+        context        = context,
+        state          = state,
+        targetUrl      = targetUrl,
+        description    = description,
+        creator        = creator.userName,
+        registeredDate = now,
+        updatedDate    = now)
      }

  def getCommitStatus(userName: String, repositoryName: String, id: Int)(implicit s: Session) :Option[CommitStatus] =
    CommitStatuses.filter(t => t.byPrimaryKey(id) && t.byRepository(userName, repositoryName)).firstOption

  def getCommitStatus(userName: String, repositoryName: String, sha: String, context: String)(implicit s: Session) :Option[CommitStatus] =
-    CommitStatuses.filter(t => t.byCommit(userName, repositoryName, sha) && t.context === context.bind).firstOption
+    CommitStatuses.filter(t => t.byCommit(userName, repositoryName, sha) && t.context===context.bind ).firstOption

  def getCommitStatues(userName: String, repositoryName: String, sha: String)(implicit s: Session) :List[CommitStatus] =
    byCommitStatues(userName, repositoryName, sha).list

-  def getRecentStatuesContexts(userName: String, repositoryName: String, time: java.util.Date)(implicit s: Session) :List[String] =
-    CommitStatuses.filter(t => t.byRepository(userName, repositoryName)).filter(t => t.updatedDate > time.bind).groupBy(_.context).map(_._1).list
-
  def getCommitStatuesWithCreator(userName: String, repositoryName: String, sha: String)(implicit s: Session) :List[(CommitStatus, Account)] =
-    byCommitStatues(userName, repositoryName, sha).innerJoin(Accounts).filter { case (t, a) => t.creator === a.userName }.list
+    byCommitStatues(userName, repositoryName, sha).innerJoin(Accounts)
+      .filter{ case (t,a) => t.creator === a.userName }.list

  protected def byCommitStatues(userName: String, repositoryName: String, sha: String)(implicit s: Session) = 
-    CommitStatuses.filter(t => t.byCommit(userName, repositoryName, sha)).sortBy(_.updatedDate desc)
+    CommitStatuses.filter(t => t.byCommit(userName, repositoryName, sha) ).sortBy(_.updatedDate desc)

 }
--- a/src/main/scala/gitbucket/core/service/IssuesService.scala
+++ b/src/main/scala/gitbucket/core/service/IssuesService.scala
@@ -399,7 +399,7 @@ trait IssuesService {
 object IssuesService {
  import javax.servlet.http.HttpServletRequest

-  val IssueLimit = 25
+  val IssueLimit = 30

  case class IssueSearchCondition(
      labels: Set[String] = Set.empty,
--- a/src/main/scala/gitbucket/core/service/LabelsService.scala
+++ b/src/main/scala/gitbucket/core/service/LabelsService.scala
@@ -12,9 +12,6 @@ trait LabelsService {
  def getLabel(owner: String, repository: String, labelId: Int)(implicit s: Session): Option[Label] =
    Labels.filter(_.byPrimaryKey(owner, repository, labelId)).firstOption

-  def getLabel(owner: String, repository: String, labelName: String)(implicit s: Session): Option[Label] =
-    Labels.filter(_.byLabel(owner, repository, labelName)).firstOption
-
  def createLabel(owner: String, repository: String, labelName: String, color: String)(implicit s: Session): Int =
    Labels returning Labels.map(_.labelId) += Label(
      userName       = owner,
--- a/src/main/scala/gitbucket/core/service/MergeService.scala
+++ b/src/main/scala/gitbucket/core/service/MergeService.scala
@@ -10,9 +10,10 @@ import org.eclipse.jgit.merge.MergeStrategy
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.transport.RefSpec
 import org.eclipse.jgit.errors.NoMergeBaseException
-import org.eclipse.jgit.lib.{ObjectId, CommitBuilder, PersonIdent, Repository}
+import org.eclipse.jgit.lib.{ObjectId, CommitBuilder, PersonIdent}
 import org.eclipse.jgit.revwalk.RevWalk

+
 trait MergeService {
  import MergeService._
  /**
@@ -51,30 +52,26 @@ trait MergeService {
  /**
   * Checks whether conflict will be caused in merging. Returns true if conflict will be caused.
   */
-  def tryMergeRemote(localUserName: String, localRepositoryName: String, localBranch: String,
-                      remoteUserName: String, remoteRepositoryName: String, remoteBranch: String): Option[(ObjectId, ObjectId, ObjectId)] = {
-    using(Git.open(getRepositoryDir(localUserName, localRepositoryName))) { git =>
-      val remoteRefName = s"refs/heads/${remoteBranch}"
-      val tmpRefName = s"refs/remote-temp/${remoteUserName}/${remoteRepositoryName}/${remoteBranch}"
+  def checkConflict(userName: String, repositoryName: String, branch: String,
+                            requestUserName: String, requestRepositoryName: String, requestBranch: String): Boolean = {
+    using(Git.open(getRepositoryDir(requestUserName, requestRepositoryName))) { git =>
+      val remoteRefName = s"refs/heads/${branch}"
+      val tmpRefName = s"refs/merge-check/${userName}/${branch}"
      val refSpec = new RefSpec(s"${remoteRefName}:${tmpRefName}").setForceUpdate(true)
      try {
        // fetch objects from origin repository branch
        git.fetch
-           .setRemote(getRepositoryDir(remoteUserName, remoteRepositoryName).toURI.toString)
+           .setRemote(getRepositoryDir(userName, repositoryName).toURI.toString)
           .setRefSpecs(refSpec)
           .call
        // merge conflict check
        val merger = MergeStrategy.RECURSIVE.newMerger(git.getRepository, true)
-        val mergeBaseTip = git.getRepository.resolve(s"refs/heads/${localBranch}")
+        val mergeBaseTip = git.getRepository.resolve(s"refs/heads/${requestBranch}")
        val mergeTip = git.getRepository.resolve(tmpRefName)
        try {
-          if(merger.merge(mergeBaseTip, mergeTip)){
-            Some((merger.getResultTreeId, mergeBaseTip, mergeTip))
-          } else {
-            None
-          }
+          !merger.merge(mergeBaseTip, mergeTip)
        } catch {
-          case e: NoMergeBaseException =>  None
+          case e: NoMergeBaseException =>  true
        }
      } finally {
        val refUpdate = git.getRepository.updateRef(refSpec.getDestination)
@@ -83,54 +80,8 @@ trait MergeService {
      }
    }
  }
-  /**
-   * Checks whether conflict will be caused in merging. Returns true if conflict will be caused.
-   */
-  def checkConflict(userName: String, repositoryName: String, branch: String,
-                            requestUserName: String, requestRepositoryName: String, requestBranch: String): Boolean =
-    tryMergeRemote(userName, repositoryName, branch, requestUserName, requestRepositoryName, requestBranch).isEmpty
-
-  def pullRemote(localUserName: String, localRepositoryName: String, localBranch: String,
-                      remoteUserName: String, remoteRepositoryName: String, remoteBranch: String,
-                      loginAccount: Account, message: String): Option[ObjectId] = {
-    tryMergeRemote(localUserName, localRepositoryName, localBranch, remoteUserName, remoteRepositoryName, remoteBranch).map{ case (newTreeId, oldBaseId, oldHeadId) =>
-      using(Git.open(getRepositoryDir(localUserName, localRepositoryName))) { git =>
-        val committer = new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
-        val newCommit = Util.createMergeCommit(git.getRepository, newTreeId, committer, message, Seq(oldBaseId, oldHeadId))
-        Util.updateRefs(git.getRepository, s"refs/heads/${localBranch}", newCommit, false, committer, Some("merge"))
-      }
-      oldBaseId
-    }
-  }
-
 }
 object MergeService{
-  object Util{
-    // return treeId
-    def createMergeCommit(repository: Repository, treeId: ObjectId, committer: PersonIdent, message: String, parents: Seq[ObjectId]): ObjectId = {
-      val mergeCommit = new CommitBuilder()
-      mergeCommit.setTreeId(treeId)
-      mergeCommit.setParentIds(parents:_*)
-      mergeCommit.setAuthor(committer)
-      mergeCommit.setCommitter(committer)
-      mergeCommit.setMessage(message)
-      // insertObject and got mergeCommit Object Id
-      val inserter = repository.newObjectInserter
-      val mergeCommitId = inserter.insert(mergeCommit)
-      inserter.flush()
-      inserter.close()
-      mergeCommitId
-    }
-    def updateRefs(repository: Repository, ref: String, newObjectId: ObjectId, force: Boolean, committer: PersonIdent, refLogMessage: Option[String] = None):Unit = {
-      // update refs
-      val refUpdate = repository.updateRef(ref)
-      refUpdate.setNewObjectId(newObjectId)
-      refUpdate.setForceUpdate(force)
-      refUpdate.setRefLogIdent(committer)
-      refLogMessage.map(refUpdate.setRefLogMessage(_, true))
-      refUpdate.update()
-    }
-  }
  case class MergeCacheInfo(git:Git, branch:String, issueId:Int){
    val repository = git.getRepository
    val mergedBranchName = s"refs/pull/${issueId}/merge"
@@ -139,17 +90,17 @@ object MergeService{
    lazy val mergeTip = repository.resolve(s"refs/pull/${issueId}/head")
    def checkConflictCache(): Option[Boolean] = {
      Option(repository.resolve(mergedBranchName)).flatMap{ merged =>
-          if(parseCommit(merged).getParents().toSet == Set( mergeBaseTip, mergeTip )){
+          if(parseCommit( merged ).getParents().toSet == Set( mergeBaseTip, mergeTip )){
            // merged branch exists
            Some(false)
-          } else {
+          }else{
            None
          }
      }.orElse(Option(repository.resolve(conflictedBranchName)).flatMap{ conflicted =>
-        if(parseCommit(conflicted).getParents().toSet == Set( mergeBaseTip, mergeTip )){
+        if(parseCommit( conflicted ).getParents().toSet == Set( mergeBaseTip, mergeTip )){
          // conflict branch exists
          Some(true)
-        } else {
+        }else{
          None
        }
      })
@@ -169,12 +120,17 @@ object MergeService{
      def updateBranch(treeId:ObjectId, message:String, branchName:String){
        // creates merge commit
        val mergeCommitId = createMergeCommit(treeId, committer, message)
-        Util.updateRefs(repository, branchName, mergeCommitId, true, committer)
+        // update refs
+        val refUpdate = repository.updateRef(branchName)
+        refUpdate.setNewObjectId(mergeCommitId)
+        refUpdate.setForceUpdate(true)
+        refUpdate.setRefLogIdent(committer)
+        refUpdate.update()
      }
      if(!conflicted){
        updateBranch(merger.getResultTreeId, s"Merge ${mergeTip.name} into ${mergeBaseTip.name}", mergedBranchName)
        git.branchDelete().setForce(true).setBranchNames(conflictedBranchName).call()
-      } else {
+      }else{
        updateBranch(mergeTipCommit.getTree().getId(), s"can't merge ${mergeTip.name} into ${mergeBaseTip.name}", conflictedBranchName)
        git.branchDelete().setForce(true).setBranchNames(mergedBranchName).call()
      }
@@ -189,12 +145,28 @@ object MergeService{
      // creates merge commit
      val mergeCommitId = createMergeCommit(mergeResultCommit.getTree().getId(), committer, message)
      // update refs
-      Util.updateRefs(repository, s"refs/heads/${branch}", mergeCommitId, false, committer, Some("merged"))
+      val refUpdate = repository.updateRef(s"refs/heads/${branch}")
+      refUpdate.setNewObjectId(mergeCommitId)
+      refUpdate.setForceUpdate(false)
+      refUpdate.setRefLogIdent(committer)
+      refUpdate.setRefLogMessage("merged", true)
+      refUpdate.update()
    }
    // return treeId
-    private def createMergeCommit(treeId: ObjectId, committer: PersonIdent, message: String) =
-      Util.createMergeCommit(repository, treeId, committer, message, Seq[ObjectId](mergeBaseTip, mergeTip))
-
+    private def createMergeCommit(treeId:ObjectId, committer:PersonIdent, message:String) = {
+      val mergeCommit = new CommitBuilder()
+      mergeCommit.setTreeId(treeId)
+      mergeCommit.setParentIds(Array[ObjectId](mergeBaseTip, mergeTip): _*)
+      mergeCommit.setAuthor(committer)
+      mergeCommit.setCommitter(committer)
+      mergeCommit.setMessage(message)
+      // insertObject and got mergeCommit Object Id
+      val inserter = repository.newObjectInserter
+      val mergeCommitId = inserter.insert(mergeCommit)
+      inserter.flush()
+      inserter.release()
+      mergeCommitId
+    }
    private def parseCommit(id:ObjectId) = using(new RevWalk( repository ))(_.parseCommit(id))
  }
 }
--- a/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala
+++ b/src/main/scala/gitbucket/core/service/ProtectedBranchService.scala
@@ -1,121 +0,0 @@
-package gitbucket.core.service
-
-import gitbucket.core.model._
-import gitbucket.core.model.Profile._
-import gitbucket.core.plugin.ReceiveHook
-import profile.simple._
-
-import org.eclipse.jgit.transport.{ReceivePack, ReceiveCommand}
-
-
-trait ProtectedBranchService {
-  import ProtectedBranchService._
-  private def getProtectedBranchInfoOpt(owner: String, repository: String, branch: String)(implicit session: Session): Option[ProtectedBranchInfo] =
-    ProtectedBranches
-      .leftJoin(ProtectedBranchContexts)
-      .on{ case (pb, c) => pb.byBranch(c.userName, c.repositoryName, c.branch) }
-      .map{ case (pb, c) => pb -> c.context.? }
-      .filter(_._1.byPrimaryKey(owner, repository, branch))
-      .list
-      .groupBy(_._1)
-      .map(p => p._1 -> p._2.flatMap(_._2))
-      .map{ case (t1, contexts) =>
-        new ProtectedBranchInfo(t1.userName, t1.repositoryName, true, contexts, t1.statusCheckAdmin)
-      }.headOption
-
-  def getProtectedBranchInfo(owner: String, repository: String, branch: String)(implicit session: Session): ProtectedBranchInfo =
-    getProtectedBranchInfoOpt(owner, repository, branch).getOrElse(ProtectedBranchInfo.disabled(owner, repository))
-
-  def getProtectedBranchList(owner: String, repository: String)(implicit session: Session): List[String] =
-    ProtectedBranches.filter(_.byRepository(owner, repository)).map(_.branch).list
-
-  def enableBranchProtection(owner: String, repository: String, branch:String, includeAdministrators: Boolean, contexts: Seq[String])
-                            (implicit session: Session): Unit = {
-    disableBranchProtection(owner, repository, branch)
-    ProtectedBranches.insert(new ProtectedBranch(owner, repository, branch, includeAdministrators && contexts.nonEmpty))
-    contexts.map{ context =>
-      ProtectedBranchContexts.insert(new ProtectedBranchContext(owner, repository, branch, context))
-    }
-  }
-
-  def disableBranchProtection(owner: String, repository: String, branch:String)(implicit session: Session): Unit =
-    ProtectedBranches.filter(_.byPrimaryKey(owner, repository, branch)).delete
-
-}
-
-object ProtectedBranchService {
-
-  class ProtectedBranchReceiveHook extends ReceiveHook with ProtectedBranchService {
-    override def preReceive(owner: String, repository: String, receivePack: ReceivePack, command: ReceiveCommand, pusher: String)
-                           (implicit session: Session): Option[String] = {
-      val branch = command.getRefName.stripPrefix("refs/heads/")
-      if(branch != command.getRefName){
-        getProtectedBranchInfo(owner, repository, branch).getStopReason(receivePack.isAllowNonFastForwards, command, pusher)
-      } else {
-        None
-      }
-    }
-  }
-
-
-  case class ProtectedBranchInfo(
-    owner: String,
-    repository: String,
-    enabled: Boolean,
-    /**
-     * Require status checks to pass before merging
-     * Choose which status checks must pass before branches can be merged into test.
-     * When enabled, commits must first be pushed to another branch,
-     * then merged or pushed directly to test after status checks have passed.
-     */
-    contexts: Seq[String],
-    /**
-     * Include administrators
-     * Enforce required status checks for repository administrators.
-     */
-    includeAdministrators: Boolean) extends AccountService with CommitStatusService {
-
-    def isAdministrator(pusher: String)(implicit session: Session): Boolean =
-      pusher == owner || getGroupMembers(owner).filter(gm => gm.userName == pusher && gm.isManager).nonEmpty
-
-    /**
-     * Can't be force pushed
-     * Can't be deleted
-     * Can't have changes merged into them until required status checks pass
-     */
-    def getStopReason(isAllowNonFastForwards: Boolean, command: ReceiveCommand, pusher: String)(implicit session: Session): Option[String] = {
-      if(enabled){
-        command.getType() match {
-          case ReceiveCommand.Type.UPDATE|ReceiveCommand.Type.UPDATE_NONFASTFORWARD if isAllowNonFastForwards =>
-            Some("Cannot force-push to a protected branch")
-          case ReceiveCommand.Type.UPDATE|ReceiveCommand.Type.UPDATE_NONFASTFORWARD if needStatusCheck(pusher) =>
-            unSuccessedContexts(command.getNewId.name) match {
-              case s if s.size == 1 => Some(s"""Required status check "${s.toSeq(0)}" is expected""")
-              case s if s.size >= 1 => Some(s"${s.size} of ${contexts.size} required status checks are expected")
-              case _ => None
-            }
-          case ReceiveCommand.Type.DELETE =>
-            Some("Cannot delete a protected branch")
-          case _ => None
-        }
-      }else{
-        None
-      }
-    }
-    def unSuccessedContexts(sha1: String)(implicit session: Session): Set[String] = if(contexts.isEmpty){
-      Set.empty
-    } else {
-      contexts.toSet -- getCommitStatues(owner, repository, sha1).filter(_.state == CommitState.SUCCESS).map(_.context).toSet
-    }
-    def needStatusCheck(pusher: String)(implicit session: Session): Boolean = pusher match {
-      case _ if !enabled              => false
-      case _ if contexts.isEmpty      => false
-      case _ if includeAdministrators => true
-      case p if isAdministrator(p)    => false
-      case _                          => true
-    }
-  }
-  object ProtectedBranchInfo{
-    def disabled(owner: String, repository: String): ProtectedBranchInfo = ProtectedBranchInfo(owner, repository, false, Nil, false)
-  }
-}
--- a/src/main/scala/gitbucket/core/service/PullRequestService.scala
+++ b/src/main/scala/gitbucket/core/service/PullRequestService.scala
@@ -1,6 +1,6 @@
 package gitbucket.core.service

-import gitbucket.core.model.{Account, Issue, PullRequest, WebHook, CommitStatus, CommitState}
+import gitbucket.core.model.{Account, Issue, PullRequest, WebHook}
 import gitbucket.core.model.Profile._
 import gitbucket.core.util.JGitUtil
 import profile.simple._
@@ -145,29 +145,4 @@ object PullRequestService {

  case class PullRequestCount(userName: String, count: Int)

-  case class MergeStatus(
-    hasConflict: Boolean,
-    commitStatues:List[CommitStatus],
-    branchProtection: ProtectedBranchService.ProtectedBranchInfo,
-    branchIsOutOfDate: Boolean,
-    hasUpdatePermission: Boolean,
-    needStatusCheck: Boolean,
-    hasMergePermission: Boolean,
-    commitIdTo: String){
-
-    val statuses: List[CommitStatus] =
-      commitStatues ++ (branchProtection.contexts.toSet -- commitStatues.map(_.context).toSet).map(CommitStatus.pending(branchProtection.owner, branchProtection.repository, _))
-    val hasRequiredStatusProblem = needStatusCheck && branchProtection.contexts.exists(context => statuses.find(_.context == context).map(_.state) != Some(CommitState.SUCCESS))
-    val hasProblem = hasRequiredStatusProblem || hasConflict || (!statuses.isEmpty && CommitState.combine(statuses.map(_.state).toSet) != CommitState.SUCCESS)
-    val canUpdate = branchIsOutOfDate && !hasConflict
-    val canMerge = hasMergePermission && !hasConflict && !hasRequiredStatusProblem
-    lazy val commitStateSummary:(CommitState, String) = {
-      val stateMap = statuses.groupBy(_.state)
-      val state = CommitState.combine(stateMap.keySet)
-      val summary = stateMap.map{ case (keyState, states) => states.size+" "+keyState.name }.mkString(", ")
-      state -> summary
-    }
-    lazy val statusesAndRequired:List[(CommitStatus, Boolean)] = statuses.map{ s => s -> branchProtection.contexts.exists(_==s.context) }
-    lazy val isAllSuccess = commitStateSummary._1==CommitState.SUCCESS
-  }
 }
--- a/src/main/scala/gitbucket/core/service/RepositorySearchService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositorySearchService.scala
@@ -79,8 +79,8 @@ trait RepositorySearchService { self: IssuesService =>
        }
      }
    }
-    treeWalk.close()
-    revWalk.close()
+    treeWalk.release
+    revWalk.release

    list.toList
  }
--- a/src/main/scala/gitbucket/core/service/RepositoryService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala
@@ -1,6 +1,5 @@
 package gitbucket.core.service

-import gitbucket.core.controller.Context
 import gitbucket.core.model.{Collaborator, Repository, Account}
 import gitbucket.core.model.Profile._
 import gitbucket.core.util.JGitUtil
@@ -47,20 +46,18 @@ trait RepositoryService { self: AccountService =>
      (Repositories filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository =>
        Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)

-        val webHooks                = WebHooks               .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val webHookEvents           = WebHookEvents          .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val milestones              = Milestones             .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val issueId                 = IssueId                .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val issues                  = Issues                 .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val pullRequests            = PullRequests           .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val labels                  = Labels                 .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val issueComments           = IssueComments          .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val issueLabels             = IssueLabels            .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val commitComments          = CommitComments         .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val commitStatuses          = CommitStatuses         .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val collaborators           = Collaborators          .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val protectedBranches       = ProtectedBranches      .filter(_.byRepository(oldUserName, oldRepositoryName)).list
-        val protectedBranchContexts = ProtectedBranchContexts.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val webHooks       = WebHooks      .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val webHookEvents  = WebHookEvents .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val milestones     = Milestones    .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issueId        = IssueId       .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issues         = Issues        .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val pullRequests   = PullRequests  .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val labels         = Labels        .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issueComments  = IssueComments .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issueLabels    = IssueLabels   .filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val commitComments = CommitComments.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val commitStatuses = CommitStatuses.filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val collaborators  = Collaborators .filter(_.byRepository(oldUserName, oldRepositoryName)).list

        Repositories.filter { t =>
          (t.originUserName === oldUserName.bind) && (t.originRepositoryName === oldRepositoryName.bind)
@@ -93,13 +90,11 @@ trait RepositoryService { self: AccountService =>
          }
        )} :_*)

-        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)) :_*)
-        CommitComments         .insertAll(commitComments.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-        CommitStatuses         .insertAll(commitStatuses.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-        ProtectedBranches      .insertAll(protectedBranches.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-        ProtectedBranchContexts.insertAll(protectedBranchContexts.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)) :_*)
+        CommitComments.insertAll(commitComments.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        CommitStatuses.insertAll(commitStatuses.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)

        // Update source repository of pull requests
        PullRequests.filter { t =>
@@ -195,9 +190,10 @@ trait RepositoryService { self: AccountService =>
   * 
   * @param userName the user name of the repository owner
   * @param repositoryName the repository name
+   * @param baseUrl the base url of this application
   * @return the repository information
   */
-  def getRepository(userName: String, repositoryName: String)(implicit s: Session): Option[RepositoryInfo] = {
+  def getRepository(userName: String, repositoryName: String, baseUrl: String)(implicit s: Session): Option[RepositoryInfo] = {
    (Repositories filter { t => t.byRepository(userName, repositoryName) } firstOption) map { repository =>
      // for getting issue count and pull request count
      val issues = Issues.filter { t =>
@@ -205,7 +201,7 @@ trait RepositoryService { self: AccountService =>
      }.map(_.pullRequest).list

      new RepositoryInfo(
-        JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName),
+        JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl),
        repository,
        issues.count(_ == false),
        issues.count(_ == true),
@@ -234,7 +230,7 @@ trait RepositoryService { self: AccountService =>
    }.list
  }

-  def getUserRepositories(userName: String, withoutPhysicalInfo: Boolean = false)
+  def getUserRepositories(userName: String, baseUrl: String, withoutPhysicalInfo: Boolean = false)
                         (implicit s: Session): List[RepositoryInfo] = {
    Repositories.filter { t1 =>
      (t1.userName === userName.bind) ||
@@ -242,9 +238,9 @@ trait RepositoryService { self: AccountService =>
    }.sortBy(_.lastActivityDate desc).list.map{ repository =>
      new RepositoryInfo(
        if(withoutPhysicalInfo){
-          new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName)
+          new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
        } else {
-          JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName)
+          JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
        },
        repository,
        getForkedCount(
@@ -260,12 +256,13 @@ trait RepositoryService { self: AccountService =>
   * If repositoryUserName is given then filters results by repository owner.
   *
   * @param loginAccount the logged in account
+   * @param baseUrl the base url of this application
   * @param repositoryUserName the repository owner (if None then returns all repositories which are visible for logged in user)
   * @param withoutPhysicalInfo if true then the result does not include physical repository information such as commit count,
   *                            branches and tags
   * @return the repository information which is sorted in descending order of lastActivityDate.
   */
-  def getVisibleRepositories(loginAccount: Option[Account], repositoryUserName: Option[String] = None,
+  def getVisibleRepositories(loginAccount: Option[Account], baseUrl: String, repositoryUserName: Option[String] = None,
                             withoutPhysicalInfo: Boolean = false)
                            (implicit s: Session): List[RepositoryInfo] = {
    (loginAccount match {
@@ -283,9 +280,9 @@ trait RepositoryService { self: AccountService =>
    }.sortBy(_.lastActivityDate desc).list.map{ repository =>
      new RepositoryInfo(
        if(withoutPhysicalInfo){
-          new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName)
+          new JGitUtil.RepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
        } else {
-          JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName)
+          JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
        },
        repository,
        getForkedCount(
@@ -312,17 +309,11 @@ trait RepositoryService { self: AccountService =>
  /**
   * Save repository options.
   */
-  def saveRepositoryOptions(userName: String, repositoryName: String,
-      description: Option[String], isPrivate: Boolean)(implicit s: Session): Unit =
+  def saveRepositoryOptions(userName: String, repositoryName: String, 
+      description: Option[String], defaultBranch: String, isPrivate: Boolean)(implicit s: Session): Unit =
    Repositories.filter(_.byRepository(userName, repositoryName))
-      .map { r => (r.description.?, r.isPrivate, r.updatedDate) }
-      .update (description, isPrivate, currentDate)
-
-  def saveRepositoryDefaultBranch(userName: String, repositoryName: String,
-      defaultBranch: String)(implicit s: Session): Unit =
-    Repositories.filter(_.byRepository(userName, repositoryName))
-      .map { r => r.defaultBranch }
-      .update (defaultBranch)
+      .map { r => (r.description.?, r.defaultBranch, r.isPrivate, r.updatedDate) }
+      .update (description, defaultBranch, isPrivate, currentDate)

  /**
   * Add collaborator to the repository.
@@ -388,39 +379,32 @@ trait RepositoryService { self: AccountService =>

 object RepositoryService {

-  case class RepositoryInfo(owner: String, name: String, repository: Repository,
+  case class RepositoryInfo(owner: String, name: String, httpUrl: String, repository: Repository,
    issueCount: Int, pullCount: Int, commitCount: Int, forkedCount: Int,
-    branchList: Seq[String], tags: Seq[JGitUtil.TagInfo], managers: Seq[String]) {
+    branchList: Seq[String], tags: Seq[JGitUtil.TagInfo], managers: Seq[String]){
+
+    lazy val host = """^https?://(.+?)(:\d+)?/""".r.findFirstMatchIn(httpUrl).get.group(1)
+
+    def sshUrl(port: Int, userName: String) = s"ssh://${userName}@${host}:${port}/${owner}/${name}.git"
+
+    def sshOpenRepoUrl(platform: String, port: Int, userName: String) = openRepoUrl(platform, sshUrl(port, userName))
+
+    def httpOpenRepoUrl(platform: String) = openRepoUrl(platform, httpUrl)
+
+    def openRepoUrl(platform: String, openUrl: String) = s"github-${platform}://openRepo/${openUrl}"

    /**
     * Creates instance with issue count and pull request count.
     */
    def this(repo: JGitUtil.RepositoryInfo, model: Repository, issueCount: Int, pullCount: Int, forkedCount: Int, managers: Seq[String]) =
-      this(
-        repo.owner, repo.name, model,
-        issueCount, pullCount, repo.commitCount, forkedCount,
-        repo.branchList, repo.tags, managers)
+      this(repo.owner, repo.name, repo.url, model, issueCount, pullCount, repo.commitCount, forkedCount, repo.branchList, repo.tags, managers)

    /**
     * Creates instance without issue count and pull request count.
     */
-    def this(repo: JGitUtil.RepositoryInfo, model: Repository, 	forkedCount: Int, managers: Seq[String]) =
-      this(
-        repo.owner, repo.name, model,
-        0, 0, repo.commitCount, forkedCount,
-        repo.branchList, repo.tags, managers)
-
-    def httpUrl(implicit context: Context): String = RepositoryService.httpUrl(owner, name)
-    def sshUrl(implicit context: Context): Option[String] = RepositoryService.sshUrl(owner, name)
+    def this(repo: JGitUtil.RepositoryInfo, model: Repository, forkedCount: Int, managers: Seq[String]) =
+      this(repo.owner, repo.name, repo.url, model, 0, 0, repo.commitCount, forkedCount, repo.branchList, repo.tags, managers)
  }

-  def httpUrl(owner: String, name: String)(implicit context: Context): String = s"${context.baseUrl}/git/${owner}/${name}.git"
-  def sshUrl(owner: String, name: String)(implicit context: Context): Option[String] =
-    if(context.settings.ssh){
-      context.loginAccount.flatMap { loginAccount =>
-        context.settings.sshAddress.map { x => s"ssh://${loginAccount.userName}@${x.host}:${x.port}/${owner}/${name}.git" }
-      }
-    } else None
-  def openRepoUrl(openUrl: String)(implicit context: Context): String = s"github-${context.platform}://openRepo/${openUrl}"
-
+  case class RepositoryTreeNode(owner: String, name: String, children: List[RepositoryTreeNode])
 }
--- a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
+++ b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
@@ -1,7 +1,6 @@
 package gitbucket.core.service

 import gitbucket.core.util.{Directory, ControlUtil}
-import gitbucket.core.util.Implicits._
 import Directory._
 import ControlUtil._
 import SystemSettingsService._
@@ -22,7 +21,6 @@ trait SystemSettingsService {
      props.setProperty(Notification, settings.notification.toString)
      settings.activityLogLimit.foreach(x => props.setProperty(ActivityLogLimit, x.toString))
      props.setProperty(Ssh, settings.ssh.toString)
-      settings.sshHost.foreach(x => props.setProperty(SshHost, x.trim))
      settings.sshPort.foreach(x => props.setProperty(SshPort, x.toString))
      props.setProperty(UseSMTP, settings.useSMTP.toString)
      if(settings.useSMTP) {
@@ -77,7 +75,6 @@ trait SystemSettingsService {
        getValue(props, Notification, false),
        getOptionValue[Int](props, ActivityLogLimit, None),
        getValue(props, Ssh, false),
-        getOptionValue[String](props, SshHost, None).map(_.trim),
        getOptionValue(props, SshPort, Some(DefaultSshPort)),
        getValue(props, UseSMTP, getValue(props, Notification, false)),   // handle migration scenario from only notification to useSMTP
        if(getValue(props, UseSMTP, getValue(props, Notification, false))){
@@ -129,19 +126,16 @@ object SystemSettingsService {
    notification: Boolean,
    activityLogLimit: Option[Int],
    ssh: Boolean,
-    sshHost: Option[String],
    sshPort: Option[Int],
    useSMTP: Boolean,
    smtp: Option[Smtp],
    ldapAuthentication: Boolean,
    ldap: Option[Ldap]){
-    def baseUrl(request: HttpServletRequest): String = baseUrl.fold(request.baseUrl)(_.stripSuffix("/"))
-
-    def sshAddress:Option[SshAddress] =
-      for {
-        host <- sshHost if ssh
+    def baseUrl(request: HttpServletRequest): String = baseUrl.getOrElse {
+      defining(request.getRequestURL.toString){ url =>
+        url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length))
      }
-      yield SshAddress(host, sshPort.getOrElse(DefaultSshPort))
+    }.stripSuffix("/")
  }

  case class Ldap(
@@ -167,10 +161,6 @@ object SystemSettingsService {
    fromAddress: Option[String],
    fromName: Option[String])

-  case class SshAddress(
-    host:String,
-    port:Int)
-
  val DefaultSshPort = 29418
  val DefaultSmtpPort = 25
  val DefaultLdapPort = 389
@@ -184,7 +174,6 @@ object SystemSettingsService {
  private val Notification = "notification"
  private val ActivityLogLimit = "activity_log_limit"
  private val Ssh = "ssh"
-  private val SshHost = "ssh.host"
  private val SshPort = "ssh.port"
  private val UseSMTP = "useSMTP"
  private val SmtpHost = "smtp.host"
@@ -227,4 +216,7 @@ object SystemSettingsService {
      else value
    }

+//  // TODO temporary flag
+//  val enablePluginSystem = Option(System.getProperty("enable.plugin")).getOrElse("false").toBoolean
+
 }
--- a/src/main/scala/gitbucket/core/service/WebHookService.scala
+++ b/src/main/scala/gitbucket/core/service/WebHookService.scala
@@ -161,7 +161,7 @@ trait WebHookPullRequestService extends WebHookService {
        baseOwner <- users.get(repository.owner)
        headOwner <- users.get(pullRequest.requestUserName)
        issueUser <- users.get(issue.openedUserName)
-        headRepo  <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
+        headRepo  <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName, baseUrl)
      } yield {
        WebHookPullRequestPayload(
          action         = action,
@@ -200,7 +200,7 @@ trait WebHookPullRequestService extends WebHookService {
    import WebHookService._
    for{
      ((issue, issueUser, pullRequest, baseOwner, headOwner), webHooks) <- getPullRequestsByRequestForWebhook(requestRepository.owner, requestRepository.name, requestBranch)
-      baseRepo <- getRepository(pullRequest.userName, pullRequest.repositoryName)
+      baseRepo <- getRepository(pullRequest.userName, pullRequest.repositoryName, baseUrl)
    } yield {
      val payload = WebHookPullRequestPayload(
        action         = action,
@@ -229,7 +229,7 @@ trait WebHookPullRequestReviewCommentService extends WebHookService {
        baseOwner <- users.get(repository.owner)
        headOwner <- users.get(pullRequest.requestUserName)
        issueUser <- users.get(issue.openedUserName)
-        headRepo  <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName)
+        headRepo  <- getRepository(pullRequest.requestUserName, pullRequest.requestRepositoryName, baseUrl)
      } yield {
        WebHookPullRequestReviewCommentPayload(
          action         = action,
--- a/src/main/scala/gitbucket/core/service/WikiService.scala
+++ b/src/main/scala/gitbucket/core/service/WikiService.scala
@@ -1,9 +1,7 @@
 package gitbucket.core.service

 import java.util.Date
-import gitbucket.core.controller.Context
 import gitbucket.core.model.Account
-import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util._
 import gitbucket.core.util.ControlUtil._
 import org.eclipse.jgit.api.Git
@@ -15,6 +13,7 @@ import java.io.ByteArrayInputStream
 import org.eclipse.jgit.patch._
 import org.eclipse.jgit.api.errors.PatchFormatException
 import scala.collection.JavaConverters._
+import RepositoryService.RepositoryInfo

 object WikiService {
  
@@ -39,13 +38,10 @@ object WikiService {
   */
  case class WikiPageHistoryInfo(name: String, committer: String, message: String, date: Date)

+  def httpUrl(repository: RepositoryInfo) = repository.httpUrl.replaceFirst("\\.git\\Z", ".wiki.git")

-  def wikiHttpUrl(repositoryInfo: RepositoryInfo)(implicit context: Context): String
-    = RepositoryService.httpUrl(repositoryInfo.owner, repositoryInfo.name + ".wiki")
-
-  def wikiSshUrl(repositoryInfo: RepositoryInfo)(implicit context: Context): Option[String]
-    = RepositoryService.sshUrl(repositoryInfo.owner, repositoryInfo.name + ".wiki")
-
+  def sshUrl(repository: RepositoryInfo, settings: SystemSettingsService.SystemSettings, userName: String) =
+    repository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), userName).replaceFirst("\\.git\\Z", ".wiki.git")
 }

 trait WikiService {
@@ -97,7 +93,7 @@ trait WikiService {
  def getWikiPageList(owner: String, repository: String): List[String] = {
    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
      JGitUtil.getFileList(git, "master", ".")
-        .filter(_.name.endsWith(".md")).filterNot(_.name.startsWith("_"))
+        .filter(_.name.endsWith(".md"))
        .map(_.name.stripSuffix(".md"))
        .sortBy(x => x)
    }
--- a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
+++ b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
@@ -18,11 +18,9 @@ import gitbucket.core.util.Directory
 object AutoUpdate {

  /**
-   * The history of versions. A head of this sequence is the current GitBucket version.
+   * The history of versions. A head of this sequence is the current BitBucket version.
   */
  val versions = Seq(
-    new Version(3, 12),
-    new Version(3, 11),
    new Version(3, 10),
    new Version(3, 9),
    new Version(3, 8),
@@ -157,7 +155,7 @@ object AutoUpdate {
  )

  /**
-   * The head version of GitBucket.
+   * The head version of BitBucket.
   */
  val headVersion = versions.head

--- a/src/main/scala/gitbucket/core/servlet/BasicAuthenticationFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/BasicAuthenticationFilter.scala
@@ -74,7 +74,7 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou

    request.paths match {
      case Array(_, repositoryOwner, repositoryName, _*) =>
-        getRepository(repositoryOwner, repositoryName.replaceFirst("\\.wiki\\.git$|\\.git$", "")) match {
+        getRepository(repositoryOwner, repositoryName.replaceFirst("\\.wiki\\.git$|\\.git$", ""), "") match {
          case Some(repository) => {
            if(!isUpdating && !repository.repository.isPrivate && settings.allowAnonymousAccess){
              chain.doFilter(request, response)
--- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
@@ -111,21 +111,13 @@ import scala.collection.JavaConverters._
 class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)(implicit session: Session)
  extends PostReceiveHook with PreReceiveHook
  with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService
-  with WebHookPullRequestService with ProtectedBranchService {
+  with WebHookPullRequestService {
  
  private val logger = LoggerFactory.getLogger(classOf[CommitLogHook])
  private var existIds: Seq[String] = Nil

  def onPreReceive(receivePack: ReceivePack, commands: java.util.Collection[ReceiveCommand]): Unit = {
    try {
-      commands.asScala.foreach { command =>
-        // call pre-commit hook
-        PluginRegistry().getReceiveHooks
-          .flatMap(_.preReceive(owner, repository, receivePack, command, pusher))
-          .headOption.foreach { error =>
-          command.setResult(ReceiveCommand.Result.REJECTED_OTHER_REASON, error)
-        }
-      }
      using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
        existIds = JGitUtil.getAllCommitIds(git)
      }
@@ -160,7 +152,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
            countIssue(IssueSearchCondition(state = "open"), false, owner -> repository) +
            countIssue(IssueSearchCondition(state = "closed"), false, owner -> repository)

-          val repositoryInfo = getRepository(owner, repository).get
+          val repositoryInfo = getRepository(owner, repository, baseUrl).get

          // Extract new commit and apply issue comment
          val defaultBranch = repositoryInfo.repository.defaultBranch
@@ -215,9 +207,6 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
                                 newId = command.getNewId(), oldId = command.getOldId())
            }
          }
-
-          // call post-commit hook
-          PluginRegistry().getReceiveHooks.foreach(_.postReceive(owner, repository, receivePack, command, pusher))
        }
      }
      // update repository last modified time.
--- a/src/main/scala/gitbucket/core/ssh/GitCommand.scala
+++ b/src/main/scala/gitbucket/core/ssh/GitCommand.scala
@@ -23,10 +23,10 @@ object GitCommand {
 abstract class GitCommand() extends Command {

  private val logger = LoggerFactory.getLogger(classOf[GitCommand])
-  @volatile protected var err: OutputStream = null
-  @volatile protected var in: InputStream = null
-  @volatile protected var out: OutputStream = null
-  @volatile protected var callback: ExitCallback = null
+  protected var err: OutputStream = null
+  protected var in: InputStream = null
+  protected var out: OutputStream = null
+  protected var callback: ExitCallback = null

  protected def runTask(user: String)(implicit session: Session): Unit

@@ -87,11 +87,11 @@ abstract class DefaultGitCommand(val owner: String, val repoName: String) extend
 }


-class DefaultGitUploadPack(owner: String, repoName: String) extends DefaultGitCommand(owner, repoName)
+class DefaultGitUploadPack(owner: String, repoName: String, baseUrl: String) extends DefaultGitCommand(owner, repoName)
    with RepositoryService with AccountService {

  override protected def runTask(user: String)(implicit session: Session): Unit = {
-    getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", "")).foreach { repositoryInfo =>
+    getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", ""), baseUrl).foreach { repositoryInfo =>
      if(!repositoryInfo.repository.isPrivate || isWritableUser(user, repositoryInfo)){
        using(Git.open(getRepositoryDir(owner, repoName))) { git =>
          val repository = git.getRepository
@@ -107,7 +107,7 @@ class DefaultGitReceivePack(owner: String, repoName: String, baseUrl: String) ex
    with RepositoryService with AccountService {

  override protected def runTask(user: String)(implicit session: Session): Unit = {
-    getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", "")).foreach { repositoryInfo =>
+    getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", ""), baseUrl).foreach { repositoryInfo =>
      if(isWritableUser(user, repositoryInfo)){
        using(Git.open(getRepositoryDir(owner, repoName))) { git =>
          val repository = git.getRepository
@@ -124,7 +124,7 @@ class DefaultGitReceivePack(owner: String, repoName: String, baseUrl: String) ex
  }
 }

-class PluginGitUploadPack(repoName: String, routing: GitRepositoryRouting) extends GitCommand
+class PluginGitUploadPack(repoName: String, baseUrl: String, routing: GitRepositoryRouting) extends GitCommand
    with SystemSettingsService {

  override protected def runTask(user: String)(implicit session: Session): Unit = {
@@ -139,7 +139,7 @@ class PluginGitUploadPack(repoName: String, routing: GitRepositoryRouting) exten
  }
 }

-class PluginGitReceivePack(repoName: String, routing: GitRepositoryRouting) extends GitCommand
+class PluginGitReceivePack(repoName: String, baseUrl: String, routing: GitRepositoryRouting) extends GitCommand
    with SystemSettingsService {

  override protected def runTask(user: String)(implicit session: Session): Unit = {
@@ -163,9 +163,9 @@ class GitCommandFactory(baseUrl: String) extends CommandFactory {
    logger.debug(s"command: $command")

    command match {
-      case SimpleCommandRegex ("upload" , repoName) if(pluginRepository(repoName)) => new PluginGitUploadPack (repoName, routing(repoName))
-      case SimpleCommandRegex ("receive", repoName) if(pluginRepository(repoName)) => new PluginGitReceivePack(repoName, routing(repoName))
-      case DefaultCommandRegex("upload" , owner, repoName) => new DefaultGitUploadPack (owner, repoName)
+      case SimpleCommandRegex ("upload" , repoName) if(pluginRepository(repoName)) => new PluginGitUploadPack (repoName, baseUrl, routing(repoName))
+      case SimpleCommandRegex ("receive", repoName) if(pluginRepository(repoName)) => new PluginGitReceivePack(repoName, baseUrl, routing(repoName))
+      case DefaultCommandRegex("upload" , owner, repoName) => new DefaultGitUploadPack (owner, repoName, baseUrl)
      case DefaultCommandRegex("receive", owner, repoName) => new DefaultGitReceivePack(owner, repoName, baseUrl)
      case _ => new UnknownCommand(command)
    }
--- a/src/main/scala/gitbucket/core/ssh/NoShell.scala
+++ b/src/main/scala/gitbucket/core/ssh/NoShell.scala
@@ -1,13 +1,12 @@
 package gitbucket.core.ssh

 import gitbucket.core.service.SystemSettingsService
-import gitbucket.core.service.SystemSettingsService.SshAddress
 import org.apache.sshd.common.Factory
 import org.apache.sshd.server.{Environment, ExitCallback, Command}
 import java.io.{OutputStream, InputStream}
 import org.eclipse.jgit.lib.Constants

-class NoShell(sshAddress:SshAddress) extends Factory[Command] {
+class NoShell extends Factory[Command] with SystemSettingsService {
  override def create(): Command = new Command() {
    private var in: InputStream = null
    private var out: OutputStream = null
@@ -16,6 +15,7 @@ class NoShell(sshAddress:SshAddress) extends Factory[Command] {

    override def start(env: Environment): Unit = {
      val user = env.getEnv.get("USER")
+      val port = loadSystemSettings().sshPort.getOrElse(SystemSettingsService.DefaultSshPort)
      val message =
        """
          | Welcome to
@@ -31,8 +31,8 @@ class NoShell(sshAddress:SshAddress) extends Factory[Command] {
          |
          | Please use:
          |
-          | git clone ssh://%s@%s:%d/OWNER/REPOSITORY_NAME.git
-        """.stripMargin.format(user, sshAddress.host, sshAddress.port).replace("\n", "\r\n") + "\r\n"
+          | git clone ssh://%s@GITBUCKET_HOST:%d/OWNER/REPOSITORY_NAME.git
+        """.stripMargin.format(user, port).replace("\n", "\r\n") + "\r\n"
      err.write(Constants.encode(message))
      err.flush()
      in.close()
--- a/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
+++ b/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
@@ -5,8 +5,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 import javax.servlet.{ServletContextEvent, ServletContextListener}

 import gitbucket.core.service.SystemSettingsService
-import gitbucket.core.service.SystemSettingsService.SshAddress
-import gitbucket.core.util.{Directory}
+import gitbucket.core.util.Directory
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider
 import org.slf4j.LoggerFactory

@@ -15,20 +14,20 @@ object SshServer {
  private val server = org.apache.sshd.server.SshServer.setUpDefaultServer()
  private val active = new AtomicBoolean(false)

-  private def configure(sshAddress: SshAddress, baseUrl: String) = {
-    server.setPort(sshAddress.port)
+  private def configure(port: Int, baseUrl: String) = {
+    server.setPort(port)
    val provider = new SimpleGeneratorHostKeyProvider(new File(s"${Directory.GitBucketHome}/gitbucket.ser"))
    provider.setAlgorithm("RSA")
    provider.setOverwriteAllowed(false)
    server.setKeyPairProvider(provider)
    server.setPublickeyAuthenticator(new PublicKeyAuthenticator)
    server.setCommandFactory(new GitCommandFactory(baseUrl))
-    server.setShellFactory(new NoShell(sshAddress))
+    server.setShellFactory(new NoShell)
  }

-  def start(sshAddress: SshAddress, baseUrl: String) = {
+  def start(port: Int, baseUrl: String) = {
    if(active.compareAndSet(false, true)){
-      configure(sshAddress, baseUrl)
+      configure(port, baseUrl)
      server.start()
      logger.info(s"Start SSH Server Listen on ${server.getPort}")
    }
@@ -56,18 +55,20 @@ class SshServerListener extends ServletContextListener with SystemSettingsServic

  override def contextInitialized(sce: ServletContextEvent): Unit = {
    val settings = loadSystemSettings()
-    if (settings.sshAddress.isDefined && settings.baseUrl.isEmpty) {
-    	logger.error("Could not start SshServer because the baseUrl is not configured.")
+    if(settings.ssh){
+      settings.baseUrl match {
+        case None =>
+          logger.error("Could not start SshServer because the baseUrl is not configured.")
+        case Some(baseUrl) =>
+          SshServer.start(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), baseUrl)
+      }
    }
-    for {
-      sshAddress <- settings.sshAddress
-      baseUrl    <- settings.baseUrl
-    }
-    SshServer.start(sshAddress, baseUrl)
  }

  override def contextDestroyed(sce: ServletContextEvent): Unit = {
-    SshServer.stop()
+    if(loadSystemSettings().ssh){
+      SshServer.stop()
+    }
  }

 }
--- a/src/main/scala/gitbucket/core/util/Authenticator.scala
+++ b/src/main/scala/gitbucket/core/util/Authenticator.scala
@@ -36,7 +36,7 @@ trait OwnerAuthenticator { self: ControllerBase with RepositoryService with Acco
  private def authenticate(action: (RepositoryInfo) => Any) = {
    {
      defining(request.paths){ paths =>
-        getRepository(paths(0), paths(1)).map { repository =>
+        getRepository(paths(0), paths(1), baseUrl).map { repository =>
          context.loginAccount match {
            case Some(x) if(x.isAdmin) => action(repository)
            case Some(x) if(repository.owner == x.userName) => action(repository)
@@ -95,7 +95,7 @@ trait CollaboratorsAuthenticator { self: ControllerBase with RepositoryService =
  private def authenticate(action: (RepositoryInfo) => Any) = {
    {
      defining(request.paths){ paths =>
-        getRepository(paths(0), paths(1)).map { repository =>
+        getRepository(paths(0), paths(1), baseUrl).map { repository =>
          context.loginAccount match {
            case Some(x) if(x.isAdmin) => action(repository)
            case Some(x) if(paths(0) == x.userName) => action(repository)
@@ -118,7 +118,7 @@ trait ReferrerAuthenticator { self: ControllerBase with RepositoryService =>
  private def authenticate(action: (RepositoryInfo) => Any) = {
    {
      defining(request.paths){ paths =>
-        getRepository(paths(0), paths(1)).map { repository =>
+        getRepository(paths(0), paths(1), baseUrl).map { repository =>
          if(!repository.repository.isPrivate){
            action(repository)
          } else {
@@ -145,7 +145,7 @@ trait ReadableUsersAuthenticator { self: ControllerBase with RepositoryService =
  private def authenticate(action: (RepositoryInfo) => Any) = {
    {
      defining(request.paths){ paths =>
-        getRepository(paths(0), paths(1)).map { repository =>
+        getRepository(paths(0), paths(1), baseUrl).map { repository =>
          context.loginAccount match {
            case Some(x) if(x.isAdmin) => action(repository)
            case Some(x) if(!repository.repository.isPrivate) => action(repository)
--- a/src/main/scala/gitbucket/core/util/ControlUtil.scala
+++ b/src/main/scala/gitbucket/core/util/ControlUtil.scala
@@ -1,6 +1,8 @@
 package gitbucket.core.util

 import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.revwalk.RevWalk
+import org.eclipse.jgit.treewalk.TreeWalk
 import scala.util.control.Exception._
 import scala.language.reflectiveCalls

@@ -29,6 +31,12 @@ object ControlUtil {
      git2.getRepository.close()
    }

+  def using[T](revWalk: RevWalk)(f: RevWalk => T): T =
+    try f(revWalk) finally revWalk.release()
+
+  def using[T](treeWalk: TreeWalk)(f: TreeWalk => T): T =
+    try f(treeWalk) finally treeWalk.release()
+
  def ignore[T](f: => Unit): Unit = try {
    f
  } catch {
--- a/src/main/scala/gitbucket/core/util/Implicits.scala
+++ b/src/main/scala/gitbucket/core/util/Implicits.scala
@@ -75,11 +75,6 @@ object Implicits {

    def gitRepositoryPath: String = request.getRequestURI.replaceFirst("^/git/", "/")

-    def baseUrl:String = {
-      val url = request.getRequestURL.toString
-      val len = url.length - (request.getRequestURI.length - request.getContextPath.length)
-      url.substring(0, len).stripSuffix("/")
-    }
  }

  implicit class RichSession(session: HttpSession){
--- a/src/main/scala/gitbucket/core/util/JGitUtil.scala
+++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala
@@ -32,13 +32,14 @@ object JGitUtil {
   *
   * @param owner the user name of the repository owner
   * @param name the repository name
+   * @param url the repository URL
   * @param commitCount the commit count. If the repository has over 1000 commits then this property is 1001.
   * @param branchList the list of branch names
   * @param tags the list of tags
   */
-  case class RepositoryInfo(owner: String, name: String, commitCount: Int, branchList: List[String], tags: List[TagInfo]){
-    def this(owner: String, name: String) = {
-      this(owner, name, 0, Nil, Nil)
+  case class RepositoryInfo(owner: String, name: String, url: String, commitCount: Int, branchList: List[String], tags: List[TagInfo]){
+    def this(owner: String, name: String, baseUrl: String) = {
+      this(owner, name, s"${baseUrl}/git/${owner}/${name}.git", 0, Nil, Nil)
    }
  }

@@ -109,8 +110,6 @@ object JGitUtil {
    newIsImage: Boolean,
    oldObjectId: Option[String],
    newObjectId: Option[String],
-    oldMode: String,
-    newMode: String,
    tooLarge: Boolean
  )

@@ -173,14 +172,14 @@ object JGitUtil {
  /**
   * Returns the repository information. It contains branch names and tag names.
   */
-  def getRepositoryInfo(owner: String, repository: String): RepositoryInfo = {
+  def getRepositoryInfo(owner: String, repository: String, baseUrl: String): RepositoryInfo = {
    using(Git.open(getRepositoryDir(owner, repository))){ git =>
      try {
        // get commit count
        val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(10001).sum

        RepositoryInfo(
-          owner, repository,
+          owner, repository, s"${baseUrl}/git/${owner}/${repository}.git",
          // commit count
          commitCount,
          // branches
@@ -196,7 +195,7 @@ object JGitUtil {
      } catch {
        // not initialized
        case e: NoHeadException => RepositoryInfo(
-          owner, repository, 0, Nil, Nil)
+          owner, repository, s"${baseUrl}/git/${owner}/${repository}.git", 0, Nil, Nil)

      }
    }
@@ -516,8 +515,6 @@ object JGitUtil {
                newIsImage  = newIsImage,
                oldObjectId = None,
                newObjectId = Option(treeWalk.getObjectId(0)).map(_.name),
-                oldMode     = treeWalk.getFileMode(0).toString,
-                newMode     = treeWalk.getFileMode(0).toString,
                tooLarge    = false
              )
            } else {
@@ -531,8 +528,6 @@ object JGitUtil {
                newIsImage  = newIsImage,
                oldObjectId = None,
                newObjectId = Option(treeWalk.getObjectId(0)).map(_.name),
-                oldMode     = treeWalk.getFileMode(0).toString,
-                newMode     = treeWalk.getFileMode(0).toString,
                tooLarge    = false
              )
            }))
@@ -567,8 +562,6 @@ object JGitUtil {
          newIsImage  = false,
          oldObjectId = Option(diff.getOldId).map(_.name),
          newObjectId = Option(diff.getNewId).map(_.name),
-          oldMode     = diff.getOldMode.toString,
-          newMode     = diff.getNewMode.toString,
          tooLarge    = true
        )
      } else {
@@ -585,8 +578,6 @@ object JGitUtil {
            newIsImage  = newIsImage,
            oldObjectId = Option(diff.getOldId).map(_.name),
            newObjectId = Option(diff.getNewId).map(_.name),
-            oldMode     = diff.getOldMode.toString,
-            newMode     = diff.getNewMode.toString,
            tooLarge    = false
          )
        } else {
@@ -600,8 +591,6 @@ object JGitUtil {
            newIsImage  = newIsImage,
            oldObjectId = Option(diff.getOldId).map(_.name),
            newObjectId = Option(diff.getNewId).map(_.name),
-            oldMode     = diff.getOldMode.toString,
-            newMode     = diff.getNewMode.toString,
            tooLarge    = false
          )
        }
@@ -640,7 +629,7 @@ object JGitUtil {

  def initRepository(dir: java.io.File): Unit =
    using(new RepositoryBuilder().setGitDir(dir).setBare.build){ repository =>
-      repository.create(true)
+      repository.create
      setReceivePack(repository)
    }

@@ -699,7 +688,7 @@ object JGitUtil {

    val newHeadId = inserter.insert(newCommit)
    inserter.flush()
-    inserter.close()
+    inserter.release()

    val refUpdate = git.getRepository.updateRef(ref)
    refUpdate.setNewObjectId(newHeadId)
--- a/src/main/scala/gitbucket/core/util/RepositoryName.scala
+++ b/src/main/scala/gitbucket/core/util/RepositoryName.scala
--- a/src/main/scala/gitbucket/core/util/Validations.scala
+++ b/src/main/scala/gitbucket/core/util/Validations.scala
@@ -1,6 +1,6 @@
 package gitbucket.core.util

-import io.github.gitbucket.scalatra.forms._
+import jp.sf.amateras.scalatra.forms._
 import org.scalatra.i18n.Messages

 trait Validations {
--- a/src/main/scala/gitbucket/core/view/Markdown.scala
+++ b/src/main/scala/gitbucket/core/view/Markdown.scala
@@ -33,30 +33,28 @@ object Markdown {
             enableTaskList: Boolean = false,
             hasWritePermission: Boolean = false,
             pages: List[String] = Nil)(implicit context: Context): String = {
+    // escape issue id
+    val s = if(enableRefsLink){
+      markdown.replaceAll("(?<=(\\W|^))#(\\d+)(?=(\\W|$))", "issue:$2")
+    } else markdown

    // escape task list
-    val source = if(enableTaskList) escapeTaskList(markdown) else markdown
+    val source = if(enableTaskList){
+      escapeTaskList(s)
+    } else s

    val options = new Options()
    options.setSanitize(true)
    options.setBreaks(enableLineBreaks)
-
-    val renderer = new GitBucketMarkedRenderer(options, repository,
-      enableWikiLink, enableRefsLink, enableAnchor, enableTaskList, hasWritePermission, pages)
-
+    val renderer = new GitBucketMarkedRenderer(options, repository, enableWikiLink, enableRefsLink, enableAnchor, enableTaskList, hasWritePermission, pages)
    Marked.marked(source, options, renderer)
  }

  /**
   * Extends markedj Renderer for GitBucket
   */
-  class GitBucketMarkedRenderer(options: Options,
-                                repository: RepositoryService.RepositoryInfo,
-                                enableWikiLink: Boolean,
-                                enableRefsLink: Boolean,
-                                enableAnchor: Boolean,
-                                enableTaskList: Boolean,
-                                hasWritePermission: Boolean,
+  class GitBucketMarkedRenderer(options: Options, repository: RepositoryService.RepositoryInfo,
+                                enableWikiLink: Boolean, enableRefsLink: Boolean, enableAnchor: Boolean, enableTaskList: Boolean, hasWritePermission: Boolean,
                                pages: List[String])
                               (implicit val context: Context) extends Renderer(options) with LinkConverter with RequestCache {

@@ -64,14 +62,11 @@ object Markdown {
      val id = generateAnchorName(text)
      val out = new StringBuilder()

-      out.append("<h" + level + " id=\"" + options.getHeaderPrefix + id + "\"")
+      out.append("<h" + level + " id=\"" + options.getHeaderPrefix + id + "\" class=\"markdown-head\">")

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

      out.append(text)
@@ -88,27 +83,28 @@ object Markdown {
      var listType: String = null
      if (ordered) {
        listType = "ol"
-      } else {
+      }
+      else {
        listType = "ul"
      }
      if(body.contains("""class="task-list-item-checkbox"""")){
-        "<" + listType + " class=\"task-list\">\n" + body + "</" + listType + ">\n"
+        return "<" + listType + " class=\"task-list\">\n" + body + "</" + listType + ">\n"
      } else {
-        "<" + listType + ">\n" + body + "</" + listType + ">\n"
+        return "<" + listType + ">\n" + body + "</" + listType + ">\n"
      }
    }

    override def listitem(text: String): String = {
      if(text.contains("""class="task-list-item-checkbox" """)){
-        "<li class=\"task-list-item\">" + text + "</li>\n"
+        return "<li class=\"task-list-item\">" + text + "</li>\n"
      } else {
-        "<li>" + text + "</li>\n"
+        return "<li>" + text + "</li>\n"
      }
    }

    override def text(text: String): String = {
      // convert commit id and username to link.
-      val t1 = if(enableRefsLink) convertRefsLinks(text, repository, "#", false) else text
+      val t1 = if(enableRefsLink) convertRefsLinks(text, repository, "issue:", false) else text

      // convert task list to checkbox.
      val t2 = if(enableTaskList) convertCheckBox(t1, hasWritePermission) else t1
--- a/src/main/scala/gitbucket/core/view/helpers.scala
+++ b/src/main/scala/gitbucket/core/view/helpers.scala
@@ -9,7 +9,7 @@ import gitbucket.core.plugin.{RenderRequest, PluginRegistry}
 import gitbucket.core.service.{RepositoryService, RequestCache}
 import gitbucket.core.util.{FileUtil, JGitUtil, StringUtil}

-import play.twirl.api.{Html, HtmlFormat}
+import play.twirl.api.Html

 /**
 * Provides helper methods for Twirl templates.
@@ -89,7 +89,6 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
               enableWikiLink: Boolean,
               enableRefsLink: Boolean,
               enableLineBreaks: Boolean,
-               enableAnchor: Boolean = true,
               enableTaskList: Boolean = false,
               hasWritePermission: Boolean = false,
               pages: List[String] = Nil)(implicit context: Context): Html =
@@ -98,7 +97,7 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
      repository         = repository,
      enableWikiLink     = enableWikiLink,
      enableRefsLink     = enableRefsLink,
-      enableAnchor       = enableAnchor,
+      enableAnchor       = true,
      enableLineBreaks   = enableLineBreaks,
      enableTaskList     = enableTaskList,
      hasWritePermission = hasWritePermission,
@@ -225,13 +224,6 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
  def avatarLink(userName: String, size: Int, mailAddress: String = "", tooltip: Boolean = false)(implicit context: Context): Html =
    userWithContent(userName, mailAddress)(avatar(userName, size, tooltip, mailAddress))

-  /**
-    * Generates the avatar link to the account page.
-    * If user does not exist or disabled, this method returns avatar image without link.
-    */
-  def avatarLink(commit: JGitUtil.CommitInfo, size: Int)(implicit context: Context): Html =
-    userWithContent(commit.authorName, commit.authorEmailAddress)(avatar(commit, size))
-
  private def userWithContent(userName: String, mailAddress: String = "", styleClass: String = "")(content: Html)(implicit context: Context): Html =
    (if(mailAddress.isEmpty){
      getAccountByUserName(userName)
@@ -296,10 +288,10 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
  }

  def commitStateIcon(state: CommitState) = Html(state match {
-    case CommitState.PENDING => """<i style="color:inherit;width:inherit;height:inherit" class="octicon octicon-primitive-dot"></i>"""
-    case CommitState.SUCCESS => """<i style="color:inherit;width:inherit;height:inherit" class="octicon octicon-check"></i>"""
-    case CommitState.ERROR   => """<i style="color:inherit;width:inherit;height:inherit" class="octicon octicon-x"></i>"""
-    case CommitState.FAILURE => """<i style="color:inherit;width:inherit;height:inherit" class="octicon octicon-x"></i>"""
+    case CommitState.PENDING => "●"
+    case CommitState.SUCCESS => "&#x2714;"
+    case CommitState.ERROR   => "×"
+    case CommitState.FAILURE => "×"
  })

  def commitStateText(state: CommitState, commitId:String) = state match {
@@ -313,19 +305,6 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
  private[this] val detectAndRenderLinksRegex = """(?i)\b((?:https?://|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,13}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))""".r

  def detectAndRenderLinks(text: String): Html = {
-    val matches = detectAndRenderLinksRegex.findAllMatchIn(text).toSeq
-
-    val (x, pos) = matches.foldLeft((collection.immutable.Seq.empty[Html], 0)){ case ((x, pos), m) =>
-      val url  = m.group(0)
-      val href = url.replace("\"", "&quot;")
-      (x ++ (Seq(
-        if(pos < m.start) Some(HtmlFormat.escape(text.substring(pos, m.start))) else None,
-        Some(Html(s"""<a href="${href}">${url}</a>"""))
-      ).flatten), m.end)
-    }
-    // append rest fragment
-    val out = if (pos < text.length) x :+ HtmlFormat.escape(text.substring(pos)) else x
-
-    HtmlFormat.fill(out)
+    Html(detectAndRenderLinksRegex.replaceAllIn(text, m => s"""<a href="${m.group(0)}">${m.group(0)}</a>"""))
  }
 }
--- a/src/main/twirl/gitbucket/core/account/application.scala.html
+++ b/src/main/twirl/gitbucket/core/account/application.scala.html
@@ -4,7 +4,7 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main("Applications"){
-<div class="container body">
+<div class="container">
  <div class="row">
    <div class="col-md-3">
      @menu("application", settings.ssh)
@@ -16,27 +16,24 @@
          @if(personalTokens.isEmpty && gneratedToken.isEmpty){
            No tokens.
          } else {
-            Tokens you have generated that can be used to access the GitBucket API.
-            <hr style="margin-top: 10px;">
+            Tokens you have generated that can be used to access the GitBucket API.<hr>
          }
          @gneratedToken.map{ case (token, tokenString) =>
            <div class="alert alert-info">
              Make sure to copy your new personal access token now. You won't be able to see it again!
            </div>
-            <a href="@path/@account.userName/_personalToken/delete/@token.accessTokenId" class="btn btn-sm btn-danger pull-right">Delete</a>
-            <div style="width: 50%;">
-              @helper.html.copy("generated-token-copy", tokenString){
-                <input type="text" value="@tokenString" class="form-control input-sm" readonly>
-              }
-            </div>
-            <hr style="margin-top: 10px;">
+            @helper.html.copy("generated-token-copy", tokenString){
+              <input type="text" value="@tokenString" style="width:21em" readonly>
+            }
+            <a href="@path/@account.userName/_personalToken/delete/@token.accessTokenId" class="btn btn-mini btn-danger pull-right">Delete</a>
+            <hr>
          }
          @personalTokens.zipWithIndex.map { case (token, i) =>
            @if(i != 0){
-              <hr style="margin-top: 10px;">
+              <hr>
            }
            <strong>@token.note</strong>
-            <a href="@path/@account.userName/_personalToken/delete/@token.accessTokenId" class="btn btn-sm btn-danger pull-right">Delete</a>
+            <a href="@path/@account.userName/_personalToken/delete/@token.accessTokenId" class="btn btn-mini btn-danger pull-right">Delete</a>
          }
        </div>
      </div>
@@ -47,7 +44,7 @@
            <fieldset>
              <label for="note" class="strong">Token description</label>
              <div><span id="error-note" class="error"></span></div>
-              <input type="text" name="note" id="note" class="form-control"/>
+              <input type="text" name="note" id="note" class="form-control" style="width: 400px;"/>
              <p class="muted">What's this token for?</p>
            </fieldset>
            <input type="submit" class="btn btn-success" value="Generate token"/>
--- a/src/main/twirl/gitbucket/core/account/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/account/edit.scala.html
@@ -3,7 +3,7 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main("Edit your profile"){
-<div class="container body">
+<div class="container">
  <div class="row">
    <div class="col-md-3">
      @menu("profile", settings.ssh)
--- a/src/main/twirl/gitbucket/core/account/group.scala.html
+++ b/src/main/twirl/gitbucket/core/account/group.scala.html
@@ -2,7 +2,7 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main(if(account.isEmpty) "Create group" else "Edit group"){
-<div class="container body">
+<div class="container">
  <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
      <div class="row">
        <div class="col-md-5">
--- a/src/main/twirl/gitbucket/core/account/main.scala.html
+++ b/src/main/twirl/gitbucket/core/account/main.scala.html
@@ -3,7 +3,7 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main(account.userName){
-  <div class="container body">
+  <div class="container">
    <div class="container-fluid">
      <div class="row">
        <div class="col-md-4">
@@ -22,7 +22,7 @@
            <div>
              <div>Groups</div>
              @groupNames.map { groupName =>
-                @avatarLink(groupName, 36, tooltip = true)
+                <a href="@url(groupName)">@avatar(groupName, 36, tooltip = true)</a>
              }
            </div>
          }
--- a/src/main/twirl/gitbucket/core/account/newrepo.scala.html
+++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
@@ -3,7 +3,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
@import context._
@import gitbucket.core.view.helpers._
@html.main("Create a New Repository"){
-<div class="body" style="width: 600px; margin: 10px auto;">
+<div style="width: 600px; margin: 10px auto;">
  <h2>Create a new repository</h2>
  <p class="muted">
    A repository contains all the files for your project, including the revision history.
@@ -21,7 +21,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
            <ul class="dropdown-menu">
              <li><a href="javascript:void(0);" data-name="@loginAccount.get.userName"><i class="octicon octicon-check"></i> <span>@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</span></a></li>
              @groupNames.map { groupName =>
-                <li><a href="javascript:void(0);" data-name="@groupName"><i class="octicon"></i> <span>@avatar(groupName, 20) @groupName</span></a></li>
+                <li><a href="javascript:void(0);" data-name="@groupName"><i class="icon-white"></i> <span>@avatar(groupName, 20) @groupName</span></a></li>
              }
            </ul>
            <input type="hidden" name="owner" id="owner" value="@loginAccount.get.userName"/>
@@ -77,8 +77,8 @@ $('#owner-dropdown a').click(function(){
  var userName = $(this).data('name');
  $('#owner').val(userName);

-  $('#owner-dropdown i').attr('class', 'octicon');
-  $(this).find('i').attr('class', 'octicon octicon-check');
+  $('#owner-dropdown i').attr('class', 'icon-white');
+  $(this).find('i').attr('class', 'icon-ok');

  $('#owner-dropdown span.strong').html($(this).find('span').html());
 });
--- a/src/main/twirl/gitbucket/core/account/register.scala.html
+++ b/src/main/twirl/gitbucket/core/account/register.scala.html
@@ -2,7 +2,7 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main("Create your account"){
-<div class="container body">
+<div class="container">
  <h3>Create your account</h3>
  <form action="@path/register" method="POST" validate="true">
    <div class="row">
--- a/src/main/twirl/gitbucket/core/account/ssh.scala.html
+++ b/src/main/twirl/gitbucket/core/account/ssh.scala.html
@@ -3,7 +3,7 @@
@import context._
@import gitbucket.core.view.helpers._
@html.main("SSH Keys"){
-<div class="container body">
+<div class="container">
  <div class="row">
    <div class="col-md-3">
      @menu("ssh", settings.ssh)
@@ -17,10 +17,10 @@
          }
          @sshKeys.zipWithIndex.map { case (key, i) =>
            @if(i != 0){
-              <hr style="margin-top: 10px;">
+              <hr>
            }
            <strong>@key.title</strong> (@SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid."))
-            <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-sm btn-danger pull-right">Delete</a>
+            <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-mini btn-danger pull-right">Delete</a>
          }
        </div>
      </div>
@@ -31,12 +31,12 @@
            <fieldset class="form-group">
              <label for="title" class="strong">Title</label>
              <div><span id="error-title" class="error"></span></div>
-              <input type="text" name="title" id="title" class="form-control"/>
+              <input type="text" name="title" id="title" class="form-control" style="width: 400px;"/>
            </fieldset>
            <fieldset class="form-group">
              <label for="publicKey" class="strong">Key</label>
              <div><span id="error-publicKey" class="error"></span></div>
-              <textarea name="publicKey" id="publicKey" class="form-control" style="height: 250px;"></textarea>
+              <textarea name="publicKey" id="publicKey" class="form-control" style="width: 600px; height: 250px;"></textarea>
            </fieldset>
            <input type="submit" class="btn btn-success" value="Add"/>
          </div>
--- a/src/main/twirl/gitbucket/core/admin/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/menu.scala.html
@@ -11,7 +11,7 @@
          <a href="@path/admin/system">System Settings</a>
        </li>
        <li@if(active=="plugins"){ class="active"}>
-          <a href="@path/admin/plugins">Plugins</a>
+        <a href="@path/admin/plugins">Plugins</a>
        </li>
        <li>
          <a href="@path/console/login.jsp">H2 Console</a>
--- a/src/main/twirl/gitbucket/core/admin/plugins/plugins.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/plugins/plugins.scala.html
--- a/Show More
+++ b/Show More