Release GitBucket 4.36.0

Update build.yml
Update oauth2-oidc-sdk to 9.10.1
2026-05-08 22:47:16 +02:00 · 2021-07-17 17:26:18 +09:00 · 2021-07-17 13:00:44 +09:00 · 2021-07-15 23:22:47 +09:00 · 2021-07-13 23:11:16 +09:00 · 2021-07-13 07:51:46 +09:00
110 changed files with 2831 additions and 2290 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -0,0 +1,4 @@
+* @takezoe
+
+build.sbt @xuwei-k
+project/* @xuwei-k
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # The guidelines for contributing

 - At first, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) and check issues and pull requests whether there is a same request in the past.
- The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles. If you don't wanna waste your time to make a pull request, ask us about your idea at [gitter room](https://gitter.im/gitbucket/gitbucket) before staring your work.
+- The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles. If you don't wanna waste your time to make a pull request, ask us about your idea at [gitter room](https://gitter.im/gitbucket/gitbucket) before starting your work.
 - You can edit the GitBucket documentation on Wiki if you have a GitHub account. When you find any mistakes or lacks in the documentation, please update it directly.
 - All your contributions are handled as [Apache Software License, Version 2.0](https://github.com/gitbucket/gitbucket/blob/master/LICENSE). When you create a pull request or update the documentation, we assume you agreed this clause.
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -12,7 +12,7 @@
 **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*
+- *be as explicit as 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)*
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,13 +5,14 @@ on: [push, pull_request]
 jobs:
  build:
    runs-on: ubuntu-latest
+    timeout-minutes: 30
    strategy:
      matrix:
        java: [8, 11]
    steps:
    - uses: actions/checkout@v2
    - name: Cache
-      uses: actions/cache@v2
+      uses: actions/cache@v2.1.6
      env:
        cache-name: cache-sbt-libs
      with:
@@ -21,11 +22,14 @@ jobs:
          ~/.cache/coursier/v1
        key: build-${{ env.cache-name }}-${{ hashFiles('build.sbt') }}
    - name: Set up JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
      with:
        java-version: ${{ matrix.java }}
+        distribution: adopt
    - name: Run tests
      run: sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck test
+    - name: Scala 3
+      run: sbt '++ 3.0.1!' update # TODO
    - name: Build executable
      run: sbt executable
    - name: Upload artifacts
--- a/.scala-steward.conf
+++ b/.scala-steward.conf
@@ -0,0 +1,7 @@
+updates.limit = 3
+
+updates.includeScala = true
+
+updates.pin = [
+  { groupId = "org.eclipse.jetty", version = "9." }
+]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,20 @@
 # Changelog
 All changes to the project will be documented in this file.

+### 4.36.0 - 17 Jul 2021
+- Tag selector in the repository viewer
+- Link iusses/pull requests of other repositories
+- Files and lines can be linked in the diff view
+- Option to disable XSS protection
+
+### 4.35.3 - 14 Jan 2021
+- Fix a bug that Wiki page cannot be deleted
+- Fix a deployment issue on Tomcat
+
+### 4.35.2 - 30 Dec 2020
+- Upgrade gitbucket-notifications-plugin to 1.10.0
+- Upgrade oauth2-oidc-sdk to 8.29.1 to solve dependency issue
+
 ### 4.35.1 - 29 Dec 2020
 - Fix database migration issue which happens if webhook is configured
 - Call push webhook when pull request is merged
--- a/README.md
+++ b/README.md
@@ -8,6 +8,8 @@ GitBucket is a Git web platform powered by Scala offering:
 - High extensibility by plugins
 - API compatibility with GitHub

+![GitBucket](https://gitbucket.github.io/img/screenshots/screenshot-repository_viewer.png)
+
 You can try an [online demo](https://gitbucket.herokuapp.com/) *(ID: root / Pass: root)* of GitBucket, and also get the latest information at [GitBucket News](https://gitbucket.github.io/gitbucket-news/).

 Features
@@ -22,8 +24,6 @@ The current version of GitBucket provides many features such as:
 - Account and group management with LDAP integration
 - a Plug-in system

-If you want to try the development version of GitBucket, see the [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/readme.md).
-
 Installation
 --------
 GitBucket requires **Java8**. You have to install it, if it is not already installed.
@@ -48,30 +48,25 @@ GitBucket has a plug-in system that allows extra functionality. Officially the f

 You can find more plugins made by the community at [GitBucket community plugins](https://gitbucket-plugins.github.io/).

+Building and Development
+-----------
+If you want to try the development version of GitBucket, or want to contribute to the project, please see the [Developer's Guide](https://github.com/gitbucket/gitbucket/blob/master/doc/readme.md).
+It provides instructions on building from source and on setting up an IDE for debugging. 
+It also contains documentation of the core concepts used within the project.
+
 Support
 --------

 - If you have any questions about GitBucket, see [Wiki](https://github.com/gitbucket/gitbucket/wiki) 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.
+- If you can't find same question and report, send it to our [Gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
 - The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles.

-What's New in 4.35.x
+What's New in 4.36.x
 -------------
-### 4.35.1 - 29 Dec 2020
-
- Fix database migration issue which happens if webhook is configured
- Call push webhook when pull request is merged
- Show commit status at commits tab of pull request
-
-### 4.35.0 - 25 Dec 2020
-
- Editor and source viewer color theme
- Auto completion for issues and pull requests
- Upload image from clipboard
- Close multiple issues by commit comment
- Create pull request from online editor
- Milestone overview
- Commit status at various places
- WebAPI coverage improvements
+### 4.36.0 - 17 Jul 2021
+- Tag selector in the repository viewer
+- Link iusses/pull requests of other repositories
+- Files and lines can be linked in the diff view
+- Option to disable XSS protection

 See the [change log](CHANGELOG.md) for all of the updates.
--- a/build.sbt
+++ b/build.sbt
@@ -1,23 +1,21 @@
 import com.typesafe.sbt.license.{DepModuleInfo, LicenseInfo}
-import com.typesafe.sbt.pgp.PgpKeys._
+import com.jsuereth.sbtpgp.PgpKeys._

 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.35.1"
+val GitBucketVersion = "4.36.0"
 val ScalatraVersion = "2.7.1"
-val JettyVersion = "9.4.32.v20200930"
-val JgitVersion = "5.9.0.202009080501-r"
+val JettyVersion = "9.4.43.v20210629"
+val JgitVersion = "5.12.0.202106070339-r"

 lazy val root = (project in file("."))
  .enablePlugins(SbtTwirl, ScalatraPlugin)
-  .settings(
-    )

 sourcesInBase := false
 organization := Organization
 name := Name
 version := GitBucketVersion
-scalaVersion := "2.13.3"
+scalaVersion := "2.13.6"

 scalafmtOnCompile := true

@@ -33,64 +31,80 @@ resolvers ++= Seq(
 libraryDependencies ++= Seq(
  "org.eclipse.jgit"                % "org.eclipse.jgit.http.server" % JgitVersion,
  "org.eclipse.jgit"                % "org.eclipse.jgit.archive"     % JgitVersion,
-  "org.scalatra"                    %% "scalatra"                    % ScalatraVersion,
-  "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion,
-  "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion,
-  "org.json4s"                      %% "json4s-jackson"              % "3.6.10",
-  "commons-io"                      % "commons-io"                   % "2.8.0",
+  "org.scalatra"                    %% "scalatra"                    % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.scalatra"                    %% "scalatra-json"               % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.scalatra"                    %% "scalatra-forms"              % ScalatraVersion cross CrossVersion.for3Use2_13,
+  "org.json4s"                      %% "json4s-jackson"              % "3.6.11" cross CrossVersion.for3Use2_13,
+  "commons-io"                      % "commons-io"                   % "2.11.0",
  "io.github.gitbucket"             % "solidbase"                    % "1.0.3",
  "io.github.gitbucket"             % "markedj"                      % "1.0.16",
-  "org.apache.commons"              % "commons-compress"             % "1.20",
+  "org.apache.commons"              % "commons-compress"             % "1.21",
  "org.apache.commons"              % "commons-email"                % "1.5",
-  "commons-net"                     % "commons-net"                  % "3.7",
-  "org.apache.httpcomponents"       % "httpclient"                   % "4.5.12",
+  "commons-net"                     % "commons-net"                  % "3.8.0",
+  "org.apache.httpcomponents"       % "httpclient"                   % "4.5.13",
  "org.apache.sshd"                 % "apache-sshd"                  % "2.1.0" exclude ("org.slf4j", "slf4j-jdk14") exclude ("org.apache.sshd", "sshd-mina") exclude ("org.apache.sshd", "sshd-netty"),
-  "org.apache.tika"                 % "tika-core"                    % "1.24.1",
-  "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.12",
+  "org.apache.tika"                 % "tika-core"                    % "1.27",
+  "com.github.takezoe"              %% "blocking-slick-32"           % "0.0.12" cross CrossVersion.for3Use2_13,
  "com.novell.ldap"                 % "jldap"                        % "2009-10-07",
  "com.h2database"                  % "h2"                           % "1.4.199",
-  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.7.0",
-  "org.postgresql"                  % "postgresql"                   % "42.2.6",
+  "org.mariadb.jdbc"                % "mariadb-java-client"          % "2.7.3",
+  "org.postgresql"                  % "postgresql"                   % "42.2.23",
  "ch.qos.logback"                  % "logback-classic"              % "1.2.3",
-  "com.zaxxer"                      % "HikariCP"                     % "3.4.5",
-  "com.typesafe"                    % "config"                       % "1.4.0",
+  "com.zaxxer"                      % "HikariCP"                     % "4.0.3",
+  "com.typesafe"                    % "config"                       % "1.4.1",
  "fr.brouillard.oss.security.xhub" % "xhub4j-core"                  % "1.1.0",
-  "com.github.bkromhout"            % "java-diff-utils"              % "2.1.1",
-  "org.cache2k"                     % "cache2k-all"                  % "1.2.4.Final",
-  "net.coobird"                     % "thumbnailator"                % "0.4.12",
+  "io.github.java-diff-utils"       % "java-diff-utils"              % "4.10",
+  "org.cache2k"                     % "cache2k-all"                  % "1.6.0.Final",
+  "net.coobird"                     % "thumbnailator"                % "0.4.14",
  "com.github.zafarkhaja"           % "java-semver"                  % "0.9.0",
-  "com.nimbusds"                    % "oauth2-oidc-sdk"              % "5.64.4",
+  "com.nimbusds"                    % "oauth2-oidc-sdk"              % "9.10.1",
  "org.eclipse.jetty"               % "jetty-webapp"                 % JettyVersion % "provided",
  "javax.servlet"                   % "javax.servlet-api"            % "3.1.0" % "provided",
-  "junit"                           % "junit"                        % "4.13" % "test",
-  "org.scalatra"                    %% "scalatra-scalatest"          % ScalatraVersion % "test",
-  "org.mockito"                     % "mockito-core"                 % "3.3.3" % "test",
-  "com.dimafeng"                    %% "testcontainers-scala"        % "0.37.0" % "test",
-  "org.testcontainers"              % "mysql"                        % "1.14.3" % "test",
-  "org.testcontainers"              % "postgresql"                   % "1.14.3" % "test",
+  "junit"                           % "junit"                        % "4.13.2" % "test",
+  "org.scalatra"                    %% "scalatra-scalatest"          % ScalatraVersion % "test" cross CrossVersion.for3Use2_13,
+  "org.mockito"                     % "mockito-core"                 % "3.11.2" % "test",
+  "com.dimafeng"                    %% "testcontainers-scala"        % "0.39.5" % "test",
+  "org.testcontainers"              % "mysql"                        % "1.15.3" % "test",
+  "org.testcontainers"              % "postgresql"                   % "1.15.3" % "test",
  "net.i2p.crypto"                  % "eddsa"                        % "0.3.0",
  "is.tagomor.woothee"              % "woothee-java"                 % "1.11.0",
-  "org.ec4j.core"                   % "ec4j-core"                    % "0.0.3",
-  "org.kohsuke"                     % "github-api"                   % "1.116" % "test"
+  "org.ec4j.core"                   % "ec4j-core"                    % "0.3.0",
+  "org.kohsuke"                     % "github-api"                   % "1.131" % "test"
 )

+libraryDependencies ~= {
+  _.map {
+    case x if x.name == "twirl-api" =>
+      x cross CrossVersion.for3Use2_13
+    case x =>
+      x
+  }
+}
+
 // Compiler settings
-scalacOptions := Seq("-deprecation", "-language:postfixOps", "-opt:l:method", "-feature")
-javacOptions in compile ++= Seq("-target", "8", "-source", "8")
-javaOptions in Jetty += "-Dlogback.configurationFile=/logback-dev.xml"
+scalacOptions := Seq(
+  "-deprecation",
+  "-language:postfixOps",
+  "-opt:l:method",
+  "-feature",
+  "-Wunused:imports",
+  "-Wconf:cat=unused&src=twirl/.*:s,cat=unused&src=scala/gitbucket/core/model/[^/]+\\.scala:s"
+)
+compile / javacOptions ++= Seq("-target", "8", "-source", "8")
+Jetty / javaOptions += "-Dlogback.configurationFile=/logback-dev.xml"

 // Test settings
 //testOptions in Test += Tests.Argument("-l", "ExternalDBTest")
-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
+Test / javaOptions += "-Dgitbucket.home=target/gitbucket_home_for_test"
+Test / testOptions += Tests.Setup(() => new java.io.File("target/gitbucket_home_for_test").mkdir())
+Test / fork := true

 // Packaging options
 packageOptions += Package.MainClass("JettyLauncher")

 // Assembly settings
-test in assembly := {}
-assemblyMergeStrategy in assembly := {
+assembly / test := {}
+assembly / assemblyMergeStrategy := {
  case PathList("META-INF", xs @ _*) =>
    (xs map { _.toLowerCase }) match {
      case ("manifest.mf" :: Nil) => MergeStrategy.discard
@@ -122,9 +136,9 @@ libraryDependencies ++= Seq(
 )

 // Run package task before test to generate target/webapp for integration test
-test in Test := {
+Test / test := {
  _root_.sbt.Keys.`package`.value
-  (test in Test).value
+  (Test / test).value
 }

 val executableKey = TaskKey[File]("executable")
@@ -155,7 +169,7 @@ executableKey := {
  IO unzip (warFile, temp)

  // include launcher classes
-  val classDir = (Keys.classDirectory in Compile).value
+  val classDir = (Compile / Keys.classDirectory).value
  val launchClasses = Seq("JettyLauncher.class" /*, "HttpsSupportConnector.class" */ )
  launchClasses foreach { name =>
    IO copyFile (classDir / name, temp / name)
@@ -258,12 +272,7 @@ pomExtra := (
  </developers>
 )

-licenseOverrides := {
-  case DepModuleInfo("com.github.bkromhout", "java-diff-utils", _) =>
-    LicenseInfo(LicenseCategory.Apache, "Apache-2.0", "http://www.apache.org/licenses/LICENSE-2.0")
-}
-
-testOptions in Test ++= {
+Test / testOptions ++= {
  if (scala.util.Properties.isWin) {
    Seq(
      Tests.Exclude(
@@ -276,3 +285,8 @@ testOptions in Test ++= {
    Nil
  }
 }
+
+Jetty / javaOptions ++= Seq(
+  "-Xdebug",
+  "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8000"
+)
--- a/doc/authenticator.md
+++ b/doc/authenticator.md
@@ -2,7 +2,7 @@ Authentication in Controller
 ========
 GitBucket provides many [authenticators](https://github.com/gitbucket/gitbucket/blob/master/src/main/scala/gitbucket/core/util/Authenticator.scala) to access controlling in the controller.

-For example, in the case of `RepositoryViwerController`,
+For example, in the case of `RepositoryViewerController`,
 it references three authenticators: `ReadableUsersAuthenticator`, `ReferrerAuthenticator` and `CollaboratorsAuthenticator`.

 ```scala
@@ -19,13 +19,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  ...
 ```

-Authenticators provides a method to add guard to actions in the controller:
+Authenticators provide a method to add guard to actions in the controller:

 - `ReadableUsersAuthenticator` provides `readableUsersOnly` method
 - `ReferrerAuthenticator` provides `referrersOnly` method
 - `CollaboratorsAuthenticator` provides `collaboratorsOnly` method

-These methods are available in each actions as below:
+These methods are available in each action as below:

 ```scala
 // Allows only the repository owner (or manager for group repository) and administrators.
@@ -38,7 +38,7 @@ get("/:owner/:repository/new/*")(collaboratorsOnly { repository =>
  ...
 })

-// Allows only signed in users which can access the repository.
+// Allows only signed-in users which can access the repository.
 post("/:owner/:repository/commit/:id/comment/new", commentForm)(readableUsersOnly { (form, repository) =>
  ...
 })
@@ -50,11 +50,11 @@ Currently, GitBucket provides below authenticators:
 |--------------------------|-----------------|--------------------------------------------------------------------------------------|
 |OneselfAuthenticator      |oneselfOnly      |Allows only oneself and administrators.                                               |
 |OwnerAuthenticator        |ownerOnly        |Allows only the repository owner and administrators.                                  |
-|UsersAuthenticator        |usersOnly        |Allows only signed in users.                                                          |
+|UsersAuthenticator        |usersOnly        |Allows only signed-in users.                                                          |
 |AdminAuthenticator        |adminOnly        |Allows only administrators.                                                           |
 |CollaboratorsAuthenticator|collaboratorsOnly|Allows only collaborators and administrators.                                         |
 |ReferrerAuthenticator     |referrersOnly    |Allows only the repository owner (or manager for group repository) and administrators.|
-|ReadableUsersAuthenticator|readableUsersOnly|Allows only signed in users which can access the repository.                          |
+|ReadableUsersAuthenticator|readableUsersOnly|Allows only signed-in users which can access the repository.                          |
 |GroupManagerAuthenticator |managersOnly     |Allows only the group managers.                                                       |

-Of course, if you make a new plugin, you can define a your own authenticator according to requirement in your plugin.
+Of course, if you make a new plugin, you can implement your own authenticator according to requirement in your plugin.
--- a/doc/auto_update.md
+++ b/doc/auto_update.md
@@ -2,7 +2,7 @@ Automatic Schema Updating
 ========
 GitBucket updates database schema automatically using [Solidbase](https://github.com/gitbucket/solidbase) in the first run after the upgrading.

-To release a new version of GitBucket, add the version definition to the [gitbucket.core.GitBucketCoreModule](https://github.com/gitbucket/gitbucket/blob/master/src/main/scala/gitbucket/core/GitBucketCoreModule.scala) at first.
+To release a new version of GitBucket, add the version definition to [gitbucket.core.GitBucketCoreModule](https://github.com/gitbucket/gitbucket/blob/master/src/main/scala/gitbucket/core/GitBucketCoreModule.scala) at first.

 ```scala
 object GitBucketCoreModule extends Module("gitbucket-core",
@@ -17,7 +17,7 @@ object GitBucketCoreModule extends Module("gitbucket-core",
 )
 ```

-Next, add a XML file which updates database schema into [/src/main/resources/update/](https://github.com/gitbucket/gitbucket/tree/master/src/main/resources/update) with a filenane defined in `GitBucketCoreModule`.
+Next, add a XML file which updates database schema into [/src/main/resources/update/](https://github.com/gitbucket/gitbucket/tree/master/src/main/resources/update) with a filename defined in `GitBucketCoreModule`.

 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
@@ -31,9 +31,9 @@ Next, add a XML file which updates database schema into [/src/main/resources/upd
 </changeSet>
 ```

-Solidbase stores the current version to `VERSIONS` table and checks it at start-up. If the stored version differs from the actual version, it executes differences between the stored version and the actual version.
+Solidbase stores the current version to `VERSIONS` table and checks it at start-up. If the stored version different from the actual version, it executes differences between the stored version and the actual version.

-We can add the SQL file instead of the XML file using `SqlMigration`. It try to load a SQL file from classpath as following order:
+We can add the SQL file instead of the XML file using `SqlMigration`. It tries to load a SQL file from classpath in the following order:

 1. Specified path (if specified)
 2. `${moduleId}_${version}_${database}.sql`
@@ -51,4 +51,4 @@ object GitBucketCoreModule extends Module("gitbucket-core",
 )
 ```

-See more details [README of Solidbase](https://github.com/gitbucket/solidbase).
+See more details at [README of Solidbase](https://github.com/gitbucket/solidbase).
--- a/doc/build.md
+++ b/doc/build.md
@@ -18,12 +18,12 @@ $ sbt ~jetty:start

 Then access `http://localhost:8080/` in your browser. The default administrator account is `root` and password is `root`.

-Source code modifications are detected and a reloaded happens automatically. You can modify the logging configuration by editing `src/main/resources/logback-dev.xml`.
+Source code modifications are detected and a reloading happens automatically. You can modify the logging configuration by editing `src/main/resources/logback-dev.xml`.

 Build war file
 --------

-To build war file, run the following command:
+To build a war file, run the following command:

 ```shell
 $ sbt package
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.4.6
+sbt.version=1.5.5
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,10 +1,10 @@
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")

-addSbtPlugin("com.geirsson"     % "sbt-scalafmt"         % "1.5.1")
-addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"            % "1.5.0")
-addSbtPlugin("com.eed3si9n"     % "sbt-assembly"         % "0.15.0")
+addSbtPlugin("org.scalameta"    % "sbt-scalafmt"         % "2.4.3")
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl"            % "1.5.1")
+addSbtPlugin("com.eed3si9n"     % "sbt-assembly"         % "1.0.0")
 addSbtPlugin("org.scalatra.sbt" % "sbt-scalatra"         % "1.0.4")
-addSbtPlugin("com.jsuereth"     % "sbt-pgp"              % "1.1.2")
+addSbtPlugin("com.github.sbt"   % "sbt-pgp"              % "2.1.2")
 addSbtPlugin("com.typesafe.sbt" % "sbt-license-report"   % "1.2.0")
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2")
-addSbtPlugin("org.scoverage"    % "sbt-scoverage"        % "1.6.1")
+addSbtPlugin("org.scoverage"    % "sbt-scoverage"        % "1.8.2")
--- a/src/main/resources/bundle-plugins.txt
+++ b/src/main/resources/bundle-plugins.txt
@@ -1,4 +1,4 @@
-notifications:1.9.0
+notifications:1.10.0
 gist:4.20.0
 emoji:4.6.0
 pages:1.9.0
--- a/src/main/resources/update/gitbucket-core_4.36.xml
+++ b/src/main/resources/update/gitbucket-core_4.36.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changeSet>
+  <addColumn tableName="REPOSITORY">
+    <column name="SAFE_MODE" type="boolean" nullable="false" defaultValue="true"/>
+  </addColumn>
+</changeSet>
--- a/src/main/scala/ScalatraBootstrap.scala
+++ b/src/main/scala/ScalatraBootstrap.scala
@@ -2,7 +2,6 @@ import java.util.EnumSet
 import javax.servlet._

 import gitbucket.core.controller.{ReleaseController, _}
-import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.SystemSettingsService
 import gitbucket.core.servlet._
 import gitbucket.core.util.Directory
--- a/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
+++ b/src/main/scala/gitbucket/core/GitBucketCoreModule.scala
@@ -12,7 +12,7 @@ import gitbucket.core.util.JDBCUtil
 import io.github.gitbucket.solidbase.Solidbase
 import io.github.gitbucket.solidbase.migration.{LiquibaseMigration, Migration, SqlMigration}
 import io.github.gitbucket.solidbase.model.{Module, Version}
-import org.json4s.NoTypeHints
+import org.json4s.{Formats, NoTypeHints}
 import org.json4s.jackson.Serialization
 import org.json4s.jackson.Serialization.write

@@ -85,7 +85,7 @@ object GitBucketCoreModule
        "4.34.0",
        new Migration() {
          override def migrate(moduleId: String, version: String, context: util.Map[String, AnyRef]): Unit = {
-            implicit val formats = Serialization.formats(NoTypeHints)
+            implicit val formats: Formats = Serialization.formats(NoTypeHints)
            import JDBCUtil._

            val conn = context.get(Solidbase.CONNECTION).asInstanceOf[Connection]
@@ -116,4 +116,7 @@ object GitBucketCoreModule
      ),
      new Version("4.35.0", new LiquibaseMigration("update/gitbucket-core_4.35.xml")),
      new Version("4.35.1"),
+      new Version("4.35.2"),
+      new Version("4.35.3"),
+      new Version("4.36.0", new LiquibaseMigration("update/gitbucket-core_4.36.xml"))
    )
--- a/src/main/scala/gitbucket/core/api/ApiBranchProtection.scala
+++ b/src/main/scala/gitbucket/core/api/ApiBranchProtection.scala
@@ -66,7 +66,7 @@ object ApiBranchProtection {
      }
  }

-  implicit val enforcementLevelSerializer = new CustomSerializer[EnforcementLevel](
+  implicit val enforcementLevelSerializer: CustomSerializer[EnforcementLevel] = new CustomSerializer[EnforcementLevel](
    format =>
      (
        {
--- a/src/main/scala/gitbucket/core/api/ApiContents.scala
+++ b/src/main/scala/gitbucket/core/api/ApiContents.scala
@@ -28,7 +28,7 @@ object ApiContents {
              "file",
              fileInfo.name,
              fileInfo.path,
-              fileInfo.commitId,
+              fileInfo.id.getName,
              Some(Base64.getEncoder.encodeToString(arr)),
              Some("base64")
            )(repositoryName)
--- a/src/main/scala/gitbucket/core/api/ApiPlugin.scala
+++ b/src/main/scala/gitbucket/core/api/ApiPlugin.scala
@@ -1,6 +1,6 @@
 package gitbucket.core.api

-import gitbucket.core.plugin.{PluginRegistry, PluginInfo}
+import gitbucket.core.plugin.PluginInfo

 case class ApiPlugin(
  id: String,
--- a/src/main/scala/gitbucket/core/api/ApiWebhook.scala
+++ b/src/main/scala/gitbucket/core/api/ApiWebhook.scala
@@ -1,8 +1,6 @@
 package gitbucket.core.api

-import gitbucket.core.model.Profile.{RepositoryWebHookEvents, RepositoryWebHooks}
 import gitbucket.core.model.{RepositoryWebHook, WebHook}
-import gitbucket.core.util.RepositoryName

 /**
 * https://docs.github.com/en/rest/reference/repos#webhooks
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -629,7 +629,9 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  }

  get("/groups/new")(usersOnly {
-    html.creategroup(List(GroupMember("", context.loginAccount.get.userName, true)))
+    context.withLoginAccount { loginAccount =>
+      html.creategroup(List(GroupMember("", loginAccount.userName, true)))
+    }
  })

  post("/groups/new", newGroupForm)(usersOnly { form =>
@@ -650,22 +652,20 @@ trait AccountControllerBase extends AccountManagementControllerBase {
  })

  get("/:groupName/_editgroup")(managersOnly {
-    defining(params("groupName")) { groupName =>
-      getAccountByUserName(groupName, true).map { account =>
-        html.editgroup(account, getGroupMembers(groupName), flash.get("info"))
-      } getOrElse NotFound()
-    }
+    val groupName = params("groupName")
+    getAccountByUserName(groupName, true).map { account =>
+      html.editgroup(account, getGroupMembers(groupName), flash.get("info"))
+    } getOrElse NotFound()
  })

  get("/:groupName/_deletegroup")(managersOnly {
-    defining(params("groupName")) {
-      groupName =>
-        // Remove from GROUP_MEMBER
-        updateGroupMembers(groupName, Nil)
-        // Disable group
-        getAccountByUserName(groupName, false).foreach { account =>
-          updateGroup(groupName, account.description, account.url, true)
-        }
+    val groupName = params("groupName")
+    // Remove from GROUP_MEMBER
+    updateGroupMembers(groupName, Nil)
+    // Disable group
+    getAccountByUserName(groupName, false).foreach { account =>
+      updateGroup(groupName, account.description, account.url, true)
+    }
 //      // Remove repositories
 //      getRepositoryNamesOfUser(groupName).foreach { repositoryName =>
 //        deleteRepository(groupName, repositoryName)
@@ -673,28 +673,25 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 //        FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
 //        FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
 //      }
-    }
    redirect("/")
  })

  post("/:groupName/_editgroup", editGroupForm)(managersOnly { form =>
-    defining(
-      params("groupName"),
-      form.members
-        .split(",")
-        .map {
-          _.split(":") match {
-            case Array(userName, isManager) => (userName, isManager.toBoolean)
-          }
+    val groupName = params("groupName")
+    val members = form.members
+      .split(",")
+      .map {
+        _.split(":") match {
+          case Array(userName, isManager) => (userName, isManager.toBoolean)
        }
-        .toList
-    ) {
-      case (groupName, members) =>
-        getAccountByUserName(groupName, true).map { account =>
-          updateGroup(groupName, form.description, form.url, false)
+      }
+      .toList

-          // Update GROUP_MEMBER
-          updateGroupMembers(form.groupName, members)
+    getAccountByUserName(groupName, true).map { account =>
+      updateGroup(groupName, form.description, form.url, false)
+
+      // Update GROUP_MEMBER
+      updateGroupMembers(form.groupName, members)
 //        // Update COLLABORATOR for group repositories
 //        getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
 //          removeCollaborators(form.groupName, repositoryName)
@@ -703,87 +700,104 @@ trait AccountControllerBase extends AccountManagementControllerBase {
 //          }
 //        }

-          updateImage(form.groupName, form.fileId, form.clearImage)
+      updateImage(form.groupName, form.fileId, form.clearImage)

-          flash.update("info", "Account information has been updated.")
-          redirect(s"/${groupName}/_editgroup")
+      flash.update("info", "Account information has been updated.")
+      redirect(s"/${groupName}/_editgroup")

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

  /**
   * Show the new repository form.
   */
  get("/new")(usersOnly {
-    html.newrepo(getGroupsByUserName(context.loginAccount.get.userName), context.settings.isCreateRepoOptionPublic)
+    context.withLoginAccount { loginAccount =>
+      html.newrepo(getGroupsByUserName(loginAccount.userName), context.settings.isCreateRepoOptionPublic)
+    }
  })

  /**
   * Create new repository.
   */
  post("/new", newRepositoryForm)(usersOnly { form =>
-    if (context.settings.repositoryOperation.create || context.loginAccount.get.isAdmin) {
-      LockUtil.lock(s"${form.owner}/${form.name}") {
-        if (getRepository(form.owner, form.name).isEmpty) {
-          createRepository(
-            context.loginAccount.get,
-            form.owner,
-            form.name,
-            form.description,
-            form.isPrivate,
-            form.initOption,
-            form.sourceUrl
-          )
-        }
-      }
-      // redirect to the repository
-      redirect(s"/${form.owner}/${form.name}")
-    } else Forbidden()
+    context.withLoginAccount {
+      loginAccount =>
+        if (context.settings.repositoryOperation.create || loginAccount.isAdmin) {
+          LockUtil.lock(s"${form.owner}/${form.name}") {
+            if (getRepository(form.owner, form.name).isDefined) {
+              // redirect to the repository if repository already exists
+              redirect(s"/${form.owner}/${form.name}")
+            } else if (!canCreateRepository(form.owner, loginAccount)) {
+              // Permission error
+              Forbidden()
+            } else {
+              // create repository asynchronously
+              createRepository(
+                loginAccount,
+                form.owner,
+                form.name,
+                form.description,
+                form.isPrivate,
+                form.initOption,
+                form.sourceUrl
+              )
+              // redirect to the repository
+              redirect(s"/${form.owner}/${form.name}")
+            }
+          }
+        } else Forbidden()
+    }
  })

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

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

-      if (getRepository(accountName, repository.name).isDefined ||
-          (accountName != loginUserName && !getGroupsByUserName(loginUserName).contains(accountName))) {
-        // redirect to the repository if repository already exists
-        redirect(s"/${accountName}/${repository.name}")
-      } else {
-        // fork repository asynchronously
-        forkRepository(accountName, repository, loginUserName)
-        // redirect to the repository
-        redirect(s"/${accountName}/${repository.name}")
-      }
-    } else Forbidden()
+          if (getRepository(accountName, repository.name).isDefined) {
+            // redirect to the repository if repository already exists
+            redirect(s"/${accountName}/${repository.name}")
+          } else if (!canCreateRepository(accountName, loginAccount)) {
+            // Permission error
+            Forbidden()
+          } else {
+            // fork repository asynchronously
+            forkRepository(accountName, repository, loginUserName)
+            // redirect to the repository
+            redirect(s"/${accountName}/${repository.name}")
+          }
+        } else Forbidden()
+    }
  })

  private def existsAccount: Constraint = new Constraint() {
--- a/src/main/scala/gitbucket/core/controller/ControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/ControllerBase.scala
@@ -28,6 +28,7 @@ import org.eclipse.jgit.revwalk.RevCommit
 import org.eclipse.jgit.treewalk._
 import org.apache.commons.io.IOUtils
 import org.slf4j.LoggerFactory
+import org.json4s.Formats

 /**
 * Provides generic features for controller implementations.
@@ -43,7 +44,7 @@ abstract class ControllerBase

  private val logger = LoggerFactory.getLogger(getClass)

-  implicit val jsonFormats = gitbucket.core.api.JsonFormat.jsonFormats
+  implicit val jsonFormats: Formats = gitbucket.core.api.JsonFormat.jsonFormats

  before("/api/v3/*") {
    contentType = formats("json")
@@ -157,11 +158,8 @@ abstract class ControllerBase
          org.scalatra.Unauthorized(
            redirect(
              "/signin?redirect=" + StringUtil.urlEncode(
-                defining(request.getQueryString) { queryString =>
-                  request.getRequestURI.substring(request.getContextPath.length) + (if (queryString != null)
-                                                                                      "?" + queryString
-                                                                                    else "")
-                }
+                request.getRequestURI
+                  .substring(request.getContextPath.length) + Option(request.getQueryString).map("?" + _).getOrElse("")
              )
            )
          )
@@ -255,7 +253,7 @@ abstract class ControllerBase
    repository: RepositoryService.RepositoryInfo
  ): Unit = {
    JGitUtil.getObjectLoaderFromId(git, objectId) { loader =>
-      contentType = FileUtil.getSafeMimeType(path)
+      contentType = FileUtil.getSafeMimeType(path, repository.repository.options.safeMode)

      if (loader.isLarge) {
        response.setContentLength(loader.getSize.toInt)
@@ -302,20 +300,27 @@ case class Context(
  }
  val sidebarCollapse = request.getSession.getAttribute("sidebar-collapse") != null

+  def withLoginAccount(f: Account => Any): Any = {
+    loginAccount match {
+      case Some(loginAccount) => f(loginAccount)
+      case None               => Unauthorized()
+    }
+  }
+
  /**
   * Get object from cache.
   *
   * If object has not been cached with the specified key then retrieves by given action.
   * Cached object are available during a request.
   */
-  def cache[A](key: String)(action: => A): A =
-    defining(Keys.Request.Cache(key)) { cacheKey =>
-      Option(request.getAttribute(cacheKey).asInstanceOf[A]).getOrElse {
-        val newObject = action
-        request.setAttribute(cacheKey, newObject)
-        newObject
-      }
+  def cache[A](key: String)(action: => A): A = {
+    val cacheKey = Keys.Request.Cache(key)
+    Option(request.getAttribute(cacheKey).asInstanceOf[A]).getOrElse {
+      val newObject = action
+      request.setAttribute(cacheKey, newObject)
+      newObject
    }
+  }

 }

--- a/src/main/scala/gitbucket/core/controller/DashboardController.scala
+++ b/src/main/scala/gitbucket/core/controller/DashboardController.scala
@@ -1,6 +1,7 @@
 package gitbucket.core.controller

 import gitbucket.core.dashboard.html
+import gitbucket.core.model.Account
 import gitbucket.core.service._
 import gitbucket.core.util.{Keys, UsersAuthenticator}
 import gitbucket.core.util.Implicits._
@@ -34,45 +35,63 @@ trait DashboardControllerBase extends ControllerBase {
    with UsersAuthenticator =>

  get("/dashboard/repos")(usersOnly {
-    val repos = getVisibleRepositories(
-      context.loginAccount,
-      None,
-      withoutPhysicalInfo = true,
-      limit = context.settings.limitVisibleRepositories
-    )
-    html.repos(getGroupNames(context.loginAccount.get.userName), repos, repos)
+    context.withLoginAccount { loginAccount =>
+      val repos = getVisibleRepositories(
+        context.loginAccount,
+        None,
+        withoutPhysicalInfo = true,
+        limit = context.settings.limitVisibleRepositories
+      )
+      html.repos(getGroupNames(loginAccount.userName), repos, repos)
+    }
  })

  get("/dashboard/issues")(usersOnly {
-    searchIssues("created_by")
+    context.withLoginAccount { loginAccount =>
+      searchIssues(loginAccount, "created_by")
+    }
  })

  get("/dashboard/issues/assigned")(usersOnly {
-    searchIssues("assigned")
+    context.withLoginAccount { loginAccount =>
+      searchIssues(loginAccount, "assigned")
+    }
  })

  get("/dashboard/issues/created_by")(usersOnly {
-    searchIssues("created_by")
+    context.withLoginAccount { loginAccount =>
+      searchIssues(loginAccount, "created_by")
+    }
  })

  get("/dashboard/issues/mentioned")(usersOnly {
-    searchIssues("mentioned")
+    context.withLoginAccount { loginAccount =>
+      searchIssues(loginAccount, "mentioned")
+    }
  })

  get("/dashboard/pulls")(usersOnly {
-    searchPullRequests("created_by")
+    context.withLoginAccount { loginAccount =>
+      searchPullRequests(loginAccount, "created_by")
+    }
  })

  get("/dashboard/pulls/created_by")(usersOnly {
-    searchPullRequests("created_by")
+    context.withLoginAccount { loginAccount =>
+      searchPullRequests(loginAccount, "created_by")
+    }
  })

  get("/dashboard/pulls/assigned")(usersOnly {
-    searchPullRequests("assigned")
+    context.withLoginAccount { loginAccount =>
+      searchPullRequests(loginAccount, "assigned")
+    }
  })

  get("/dashboard/pulls/mentioned")(usersOnly {
-    searchPullRequests("mentioned")
+    context.withLoginAccount { loginAccount =>
+      searchPullRequests(loginAccount, "mentioned")
+    }
  })

  private def getOrCreateCondition(key: String, filter: String, userName: String) = {
@@ -85,10 +104,10 @@ trait DashboardControllerBase extends ControllerBase {
    }
  }

-  private def searchIssues(filter: String) = {
+  private def searchIssues(loginAccount: Account, filter: String) = {
    import IssuesService._

-    val userName = context.loginAccount.get.userName
+    val userName = loginAccount.userName
    val condition = getOrCreateCondition(Keys.Session.DashboardIssues, filter, userName)
    val userRepos = getUserRepositories(userName, true).map(repo => repo.owner -> repo.name)
    val page = IssueSearchCondition.page(request)
@@ -115,11 +134,11 @@ trait DashboardControllerBase extends ControllerBase {
    )
  }

-  private def searchPullRequests(filter: String) = {
+  private def searchPullRequests(loginAccount: Account, filter: String) = {
    import IssuesService._
    import PullRequestService._

-    val userName = context.loginAccount.get.userName
+    val userName = loginAccount.userName
    val condition = getOrCreateCondition(Keys.Session.DashboardPulls, filter, userName)
    val allRepos = getAllRepositories(userName)
    val page = IssueSearchCondition.page(request)
--- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala
+++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala
@@ -6,7 +6,6 @@ import gitbucket.core.model.Account
 import gitbucket.core.service.{AccountService, ReleaseService, RepositoryService}
 import gitbucket.core.servlet.Database
 import gitbucket.core.util._
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import org.eclipse.jgit.api.Git
@@ -18,6 +17,7 @@ import org.apache.commons.io.{FileUtils, IOUtils}

 import scala.util.Using
 import gitbucket.core.service.SystemSettingsService
+import slick.jdbc.JdbcBackend.Session

 /**
 * Provides Ajax based file upload functionality.
@@ -40,7 +40,7 @@ class FileUploadController
          .writeByteArrayToFile(new File(getTemporaryDir(session.getId), FileUtil.checkFilename(fileId)), file.get())
        session += Keys.Session.Upload(fileId) -> file.name
      },
-      FileUtil.isImage
+      FileUtil.isImage(_)
    )
  }

@@ -131,7 +131,7 @@ class FileUploadController
    } getOrElse BadRequest()
  }

-  post("/release/:owner/:repository/:tag") {
+  post("/release/:owner/:repository/*") {
    setMultipartConfigForLargeFile()
    session
      .get(Keys.Session.LoginAccount)
@@ -139,7 +139,7 @@ class FileUploadController
        case _: Account =>
          val owner = params("owner")
          val repository = params("repository")
-          val tag = params("tag")
+          val tag = multiParams("splat").head
          execute(
            { (file, fileId) =>
              FileUtils.writeByteArrayToFile(
@@ -178,7 +178,7 @@ class FileUploadController
  }

  private def onlyWikiEditable(owner: String, repository: String, loginAccount: Account)(action: => Any): Any = {
-    implicit val session = Database.getSession(request)
+    implicit val session: Session = Database.getSession(request)
    getRepository(owner, repository) match {
      case Some(x) =>
        x.repository.options.wikiOption match {
@@ -191,14 +191,13 @@ class FileUploadController
    }
  }

-  private def execute(f: (FileItem, String) => Unit, mimeTypeChcker: (String) => Boolean) =
+  private def execute(f: (FileItem, String) => Unit, mimeTypeChecker: (String) => Boolean) =
    fileParams.get("file") match {
-      case Some(file) if (mimeTypeChcker(file.name)) =>
-        defining(FileUtil.generateFileId) { fileId =>
-          f(file, fileId)
-          contentType = "text/plain"
-          Ok(fileId)
-        }
+      case Some(file) if mimeTypeChecker(file.name) =>
+        val fileId = FileUtil.generateFileId
+        f(file, fileId)
+        contentType = "text/plain"
+        Ok(fileId)
      case _ => BadRequest()
    }

--- a/src/main/scala/gitbucket/core/controller/IndexController.scala
+++ b/src/main/scala/gitbucket/core/controller/IndexController.scala
@@ -8,7 +8,6 @@ import gitbucket.core.helper.xml
 import gitbucket.core.model.Account
 import gitbucket.core.service._
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util._
 import gitbucket.core.view.helpers._
 import org.scalatra.Ok
@@ -237,50 +236,49 @@ trait IndexControllerBase extends ControllerBase {

  // TODO Move to RepositoryViewrController?
  get("/:owner/:repository/search")(referrersOnly { repository =>
-    defining(params.getOrElse("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
-        }
+    val query = params.getOrElse("q", "").trim
+    val target = params.getOrElse("type", "code")
+    val page = try {
+      val i = params.getOrElse("page", "1").toInt
+      if (i <= 0) 1 else i
+    } catch {
+      case _: NumberFormatException => 1
+    }

-        target.toLowerCase match {
-          case "issues" =>
-            gitbucket.core.search.html.issues(
-              if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, false) else Nil,
-              false,
-              query,
-              page,
-              repository
-            )
+    target.toLowerCase match {
+      case "issues" =>
+        gitbucket.core.search.html.issues(
+          if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, false) else Nil,
+          false,
+          query,
+          page,
+          repository
+        )

-          case "pulls" =>
-            gitbucket.core.search.html.issues(
-              if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, true) else Nil,
-              true,
-              query,
-              page,
-              repository
-            )
+      case "pulls" =>
+        gitbucket.core.search.html.issues(
+          if (query.nonEmpty) searchIssues(repository.owner, repository.name, query, true) else Nil,
+          true,
+          query,
+          page,
+          repository
+        )

-          case "wiki" =>
-            gitbucket.core.search.html.wiki(
-              if (query.nonEmpty) searchWikiPages(repository.owner, repository.name, query) else Nil,
-              query,
-              page,
-              repository
-            )
+      case "wiki" =>
+        gitbucket.core.search.html.wiki(
+          if (query.nonEmpty) searchWikiPages(repository.owner, repository.name, query) else Nil,
+          query,
+          page,
+          repository
+        )

-          case _ =>
-            gitbucket.core.search.html.code(
-              if (query.nonEmpty) searchFiles(repository.owner, repository.name, query) else Nil,
-              query,
-              page,
-              repository
-            )
-        }
+      case _ =>
+        gitbucket.core.search.html.code(
+          if (query.nonEmpty) searchFiles(repository.owner, repository.name, query) else Nil,
+          query,
+          page,
+          repository
+        )
    }
  })

--- a/src/main/scala/gitbucket/core/controller/IssuesController.scala
+++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala
@@ -1,9 +1,9 @@
 package gitbucket.core.controller

 import gitbucket.core.issues.html
+import gitbucket.core.model.Account
 import gitbucket.core.service.IssuesService._
 import gitbucket.core.service._
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
 import gitbucket.core.view
@@ -95,212 +95,224 @@ trait IssuesControllerBase extends ControllerBase {
  })

  get("/:owner/:repository/issues/:id")(referrersOnly { repository =>
-    defining(repository.owner, repository.name, params("id")) {
-      case (owner, name, issueId) =>
-        getIssue(owner, name, issueId) map {
-          issue =>
-            if (issue.isPullRequest) {
-              redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
-            } else {
-              html.issue(
-                issue,
-                getComments(owner, name, issueId.toInt),
-                getIssueLabels(owner, name, issueId.toInt),
-                getAssignableUserNames(owner, name),
-                getMilestonesWithIssueCount(owner, name),
-                getPriorities(owner, name),
-                getLabels(owner, name),
-                isIssueEditable(repository),
-                isIssueManageable(repository),
-                isIssueCommentManageable(repository),
-                repository
-              )
-            }
-        } getOrElse NotFound()
-    }
+    val issueId = params("id")
+    getIssue(repository.owner, repository.name, issueId) map {
+      issue =>
+        if (issue.isPullRequest) {
+          redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+        } else {
+          html.issue(
+            issue,
+            getComments(repository.owner, repository.name, issueId.toInt),
+            getIssueLabels(repository.owner, repository.name, issueId.toInt),
+            getAssignableUserNames(repository.owner, repository.name),
+            getMilestonesWithIssueCount(repository.owner, repository.name),
+            getPriorities(repository.owner, repository.name),
+            getLabels(repository.owner, repository.name),
+            isIssueEditable(repository),
+            isIssueManageable(repository),
+            isIssueCommentManageable(repository),
+            repository
+          )
+        }
+    } getOrElse NotFound()
  })

  get("/:owner/:repository/issues/new")(readableUsersOnly { repository =>
    if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
-      defining(repository.owner, repository.name) {
-        case (owner, name) =>
-          html.create(
-            getAssignableUserNames(owner, name),
-            getMilestones(owner, name),
-            getPriorities(owner, name),
-            getDefaultPriority(owner, name),
-            getLabels(owner, name),
-            isIssueManageable(repository),
-            getContentTemplate(repository, "ISSUE_TEMPLATE"),
-            repository
-          )
-      }
+      html.create(
+        getAssignableUserNames(repository.owner, repository.name),
+        getMilestones(repository.owner, repository.name),
+        getPriorities(repository.owner, repository.name),
+        getDefaultPriority(repository.owner, repository.name),
+        getLabels(repository.owner, repository.name),
+        isIssueManageable(repository),
+        getContentTemplate(repository, "ISSUE_TEMPLATE"),
+        repository
+      )
    } else Unauthorized()
  })

  post("/:owner/:repository/issues/new", issueCreateForm)(readableUsersOnly { (form, repository) =>
-    if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
-      val issue = createIssue(
-        repository,
-        form.title,
-        form.content,
-        form.assignedUserName,
-        form.milestoneId,
-        form.priorityId,
-        form.labelNames.toSeq.flatMap(_.split(",")),
-        context.loginAccount.get
-      )
-
-      redirect(s"/${issue.userName}/${issue.repositoryName}/issues/${issue.issueId}")
-    } else Unauthorized()
+    context.withLoginAccount {
+      loginAccount =>
+        if (isIssueEditable(repository)) { // TODO Should this check is provided by authenticator?
+          val issue = createIssue(
+            repository,
+            form.title,
+            form.content,
+            form.assignedUserName,
+            form.milestoneId,
+            form.priorityId,
+            form.labelNames.toSeq.flatMap(_.split(",")),
+            loginAccount
+          )
+          redirect(s"/${issue.userName}/${issue.repositoryName}/issues/${issue.issueId}")
+        } else Unauthorized()
+    }
  })

  ajaxPost("/:owner/:repository/issues/edit_title/:id", issueTitleEditForm)(readableUsersOnly { (title, repository) =>
-    defining(repository.owner, repository.name) {
-      case (owner, name) =>
-        getIssue(owner, name, params("id")).map {
+    context.withLoginAccount {
+      loginAccount =>
+        getIssue(repository.owner, repository.name, params("id")).map {
          issue =>
-            if (isEditableContent(owner, name, issue.openedUserName)) {
+            if (isEditableContent(repository.owner, repository.name, issue.openedUserName, loginAccount)) {
              if (issue.title != title) {
                // update issue
-                updateIssue(owner, name, issue.issueId, title, issue.content)
+                updateIssue(repository.owner, repository.name, issue.issueId, title, issue.content)
                // extract references and create refer comment
-                createReferComment(owner, name, issue.copy(title = title), title, context.loginAccount.get)
+                createReferComment(repository.owner, repository.name, issue.copy(title = title), title, loginAccount)
                createComment(
-                  owner,
-                  name,
-                  context.loginAccount.get.userName,
+                  repository.owner,
+                  repository.name,
+                  loginAccount.userName,
                  issue.issueId,
                  issue.title + "\r\n" + title,
                  "change_title"
                )
              }
-              redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
+              redirect(s"/${repository.owner}/${repository.name}/issues/_data/${issue.issueId}")
            } else Unauthorized()
        } getOrElse NotFound()
    }
  })

  ajaxPost("/:owner/:repository/issues/edit/:id", issueEditForm)(readableUsersOnly { (content, repository) =>
-    defining(repository.owner, repository.name) {
-      case (owner, name) =>
-        getIssue(owner, name, params("id")).map { issue =>
-          if (isEditableContent(owner, name, issue.openedUserName)) {
+    context.withLoginAccount {
+      loginAccount =>
+        getIssue(repository.owner, repository.name, params("id")).map { issue =>
+          if (isEditableContent(repository.owner, repository.name, issue.openedUserName, loginAccount)) {
            // update issue
-            updateIssue(owner, name, issue.issueId, issue.title, content)
+            updateIssue(repository.owner, repository.name, issue.issueId, issue.title, content)
            // extract references and create refer comment
-            createReferComment(owner, name, issue, content.getOrElse(""), context.loginAccount.get)
+            createReferComment(repository.owner, repository.name, issue, content.getOrElse(""), loginAccount)

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

  post("/:owner/:repository/issue_comments/new", commentForm)(readableUsersOnly { (form, repository) =>
-    getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
-      val actionOpt =
-        params.get("action").filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName))
-      handleComment(issue, Some(form.content), repository, actionOpt) map {
-        case (issue, id) =>
-          redirect(
-            s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}"
-          )
-      }
-    } getOrElse NotFound()
+    context.withLoginAccount {
+      loginAccount =>
+        getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
+          val actionOpt =
+            params
+              .get("action")
+              .filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName, loginAccount))
+          handleComment(issue, Some(form.content), repository, actionOpt) map {
+            case (issue, id) =>
+              redirect(
+                s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}"
+              )
+          }
+        } getOrElse NotFound()
+    }
  })

  post("/:owner/:repository/issue_comments/state", issueStateForm)(readableUsersOnly { (form, repository) =>
-    getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
-      val actionOpt =
-        params.get("action").filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName))
-      handleComment(issue, form.content, repository, actionOpt) map {
-        case (issue, id) =>
-          redirect(
-            s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}"
-          )
-      }
-    } getOrElse NotFound()
+    context.withLoginAccount {
+      loginAccount =>
+        getIssue(repository.owner, repository.name, form.issueId.toString).flatMap { issue =>
+          val actionOpt =
+            params
+              .get("action")
+              .filter(_ => isEditableContent(issue.userName, issue.repositoryName, issue.openedUserName, loginAccount))
+          handleComment(issue, form.content, repository, actionOpt) map {
+            case (issue, id) =>
+              redirect(
+                s"/${repository.owner}/${repository.name}/${if (issue.isPullRequest) "pull" else "issues"}/${form.issueId}#comment-${id}"
+              )
+          }
+        } getOrElse NotFound()
+    }
  })

  ajaxPost("/:owner/:repository/issue_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
-    defining(repository.owner, repository.name) {
-      case (owner, name) =>
-        getComment(owner, name, params("id")).map { comment =>
-          if (isEditableContent(owner, name, comment.commentedUserName)) {
+    context.withLoginAccount {
+      loginAccount =>
+        getComment(repository.owner, repository.name, params("id")).map { comment =>
+          if (isEditableContent(repository.owner, repository.name, comment.commentedUserName, loginAccount)) {
            updateComment(comment.issueId, comment.commentId, form.content)
-            redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
+            redirect(s"/${repository.owner}/${repository.name}/issue_comments/_data/${comment.commentId}")
          } else Unauthorized()
        } getOrElse NotFound()
    }
  })

  ajaxPost("/:owner/:repository/issue_comments/delete/:id")(readableUsersOnly { repository =>
-    defining(repository.owner, repository.name) {
-      case (owner, name) =>
-        getComment(owner, name, params("id")).map { comment =>
-          if (isDeletableComment(owner, name, comment.commentedUserName)) {
-            Ok(deleteComment(repository.owner, repository.name, comment.issueId, comment.commentId))
-          } else Unauthorized()
-        } getOrElse NotFound()
+    context.withLoginAccount { loginAccount =>
+      getComment(repository.owner, repository.name, params("id")).map { comment =>
+        if (isDeletableComment(repository.owner, repository.name, comment.commentedUserName, loginAccount)) {
+          Ok(deleteComment(repository.owner, repository.name, comment.issueId, comment.commentId))
+        } else Unauthorized()
+      } getOrElse NotFound()
    }
  })

  ajaxGet("/:owner/:repository/issues/_data/:id")(readableUsersOnly { repository =>
-    getIssue(repository.owner, repository.name, params("id")) map {
-      x =>
-        if (isEditableContent(x.userName, x.repositoryName, x.openedUserName)) {
-          params.get("dataType") collect {
-            case t if t == "html" => html.editissue(x.content, x.issueId, repository)
-          } getOrElse {
-            contentType = formats("json")
-            org.json4s.jackson.Serialization.write(
-              Map(
-                "title" -> x.title,
-                "content" -> Markdown.toHtml(
-                  markdown = x.content getOrElse "No description given.",
-                  repository = repository,
-                  branch = repository.repository.defaultBranch,
-                  enableWikiLink = false,
-                  enableRefsLink = true,
-                  enableAnchor = true,
-                  enableLineBreaks = true,
-                  enableTaskList = true,
-                  hasWritePermission = true
+    context.withLoginAccount {
+      loginAccount =>
+        getIssue(repository.owner, repository.name, params("id")) map {
+          x =>
+            if (isEditableContent(x.userName, x.repositoryName, x.openedUserName, loginAccount)) {
+              params.get("dataType") collect {
+                case t if t == "html" => html.editissue(x.content, x.issueId, repository)
+              } getOrElse {
+                contentType = formats("json")
+                org.json4s.jackson.Serialization.write(
+                  Map(
+                    "title" -> x.title,
+                    "content" -> Markdown.toHtml(
+                      markdown = x.content getOrElse "No description given.",
+                      repository = repository,
+                      branch = repository.repository.defaultBranch,
+                      enableWikiLink = false,
+                      enableRefsLink = true,
+                      enableAnchor = true,
+                      enableLineBreaks = true,
+                      enableTaskList = true,
+                      hasWritePermission = true
+                    )
+                  )
                )
-              )
-            )
-          }
-        } else Unauthorized()
-    } getOrElse NotFound()
+              }
+            } else Unauthorized()
+        } getOrElse NotFound()
+    }
  })

  ajaxGet("/:owner/:repository/issue_comments/_data/:id")(readableUsersOnly { repository =>
-    getComment(repository.owner, repository.name, params("id")) map {
-      x =>
-        if (isEditableContent(x.userName, x.repositoryName, x.commentedUserName)) {
-          params.get("dataType") collect {
-            case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
-          } getOrElse {
-            contentType = formats("json")
-            org.json4s.jackson.Serialization.write(
-              Map(
-                "content" -> view.Markdown.toHtml(
-                  markdown = x.content,
-                  repository = repository,
-                  branch = repository.repository.defaultBranch,
-                  enableWikiLink = false,
-                  enableRefsLink = true,
-                  enableAnchor = true,
-                  enableLineBreaks = true,
-                  enableTaskList = true,
-                  hasWritePermission = true
+    context.withLoginAccount {
+      loginAccount =>
+        getComment(repository.owner, repository.name, params("id")) map {
+          x =>
+            if (isEditableContent(x.userName, x.repositoryName, x.commentedUserName, loginAccount)) {
+              params.get("dataType") collect {
+                case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
+              } getOrElse {
+                contentType = formats("json")
+                org.json4s.jackson.Serialization.write(
+                  Map(
+                    "content" -> view.Markdown.toHtml(
+                      markdown = x.content,
+                      repository = repository,
+                      branch = repository.repository.defaultBranch,
+                      enableWikiLink = false,
+                      enableRefsLink = true,
+                      enableAnchor = true,
+                      enableLineBreaks = true,
+                      enableTaskList = true,
+                      hasWritePermission = true
+                    )
+                  )
                )
-              )
-            )
-          }
-        } else Unauthorized()
-    } getOrElse NotFound()
+              }
+            } else Unauthorized()
+        } getOrElse NotFound()
+    }
  })

  ajaxPost("/:owner/:repository/issues/new/label")(writableUsersOnly { repository =>
@@ -310,17 +322,15 @@ trait IssuesControllerBase extends ControllerBase {
  })

  ajaxPost("/:owner/:repository/issues/:id/label/new")(writableUsersOnly { repository =>
-    defining(params("id").toInt) { issueId =>
-      registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
-      html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
-    }
+    val issueId = params("id").toInt
+    registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
+    html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
  })

  ajaxPost("/:owner/:repository/issues/:id/label/delete")(writableUsersOnly { repository =>
-    defining(params("id").toInt) { issueId =>
-      deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
-      html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
-    }
+    val issueId = params("id").toInt
+    deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt, true)
+    html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
  })

  ajaxPost("/:owner/:repository/issues/:id/assign")(writableUsersOnly { repository =>
@@ -353,26 +363,27 @@ trait IssuesControllerBase extends ControllerBase {
  })

  post("/:owner/:repository/issues/batchedit/state")(writableUsersOnly { repository =>
-    defining(params.get("value")) {
-      action =>
-        action match {
-          case Some("open") =>
-            executeBatch(repository) { issueId =>
-              getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
-                handleComment(issue, None, repository, Some("reopen"))
-              }
-            }
-          case Some("close") =>
-            executeBatch(repository) { issueId =>
-              getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
-                handleComment(issue, None, repository, Some("close"))
-              }
-            }
-          case _ => BadRequest()
+    val action = params.get("value")
+    action match {
+      case Some("open") =>
+        executeBatch(repository) { issueId =>
+          getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+            handleComment(issue, None, repository, Some("reopen"))
+          }
        }
        if (params("uri").nonEmpty) {
          redirect(params("uri"))
        }
+      case Some("close") =>
+        executeBatch(repository) { issueId =>
+          getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
+            handleComment(issue, None, repository, Some("close"))
+          }
+        }
+        if (params("uri").nonEmpty) {
+          redirect(params("uri"))
+        }
+      case _ => BadRequest()
    }
  })

@@ -390,29 +401,26 @@ trait IssuesControllerBase extends ControllerBase {
  })

  post("/:owner/:repository/issues/batchedit/assign")(writableUsersOnly { repository =>
-    defining(assignedUserName("value")) { value =>
-      executeBatch(repository) {
-        updateAssignedUserName(repository.owner, repository.name, _, value, true)
-      }
-      if (params("uri").nonEmpty) {
-        redirect(params("uri"))
-      }
+    val value = assignedUserName("value")
+    executeBatch(repository) {
+      updateAssignedUserName(repository.owner, repository.name, _, value, true)
+    }
+    if (params("uri").nonEmpty) {
+      redirect(params("uri"))
    }
  })

  post("/:owner/:repository/issues/batchedit/milestone")(writableUsersOnly { repository =>
-    defining(milestoneId("value")) { value =>
-      executeBatch(repository) {
-        updateMilestoneId(repository.owner, repository.name, _, value, true)
-      }
+    val value = milestoneId("value")
+    executeBatch(repository) {
+      updateMilestoneId(repository.owner, repository.name, _, value, true)
    }
  })

  post("/:owner/:repository/issues/batchedit/priority")(writableUsersOnly { repository =>
-    defining(priorityId("value")) { value =>
-      executeBatch(repository) {
-        updatePriorityId(repository.owner, repository.name, _, value, true)
-      }
+    val value = priorityId("value")
+    executeBatch(repository) {
+      updatePriorityId(repository.owner, repository.name, _, value, true)
    }
  })

@@ -464,48 +472,51 @@ trait IssuesControllerBase extends ControllerBase {
  }

  private def searchIssues(repository: RepositoryService.RepositoryInfo) = {
-    defining(repository.owner, repository.name) {
-      case (owner, repoName) =>
-        val page = IssueSearchCondition.page(request)
-        // retrieve search condition
-        val condition = IssueSearchCondition(request)
-        // search issues
-        val issues =
-          searchIssue(condition, IssueSearchOption.Issues, (page - 1) * IssueLimit, IssueLimit, owner -> repoName)
+    val page = IssueSearchCondition.page(request)
+    // retrieve search condition
+    val condition = IssueSearchCondition(request)
+    // search issues
+    val issues =
+      searchIssue(
+        condition,
+        IssueSearchOption.Issues,
+        (page - 1) * IssueLimit,
+        IssueLimit,
+        repository.owner -> repository.name
+      )

-        html.list(
-          "issues",
-          issues.map(issue => (issue, None)),
-          page,
-          getAssignableUserNames(owner, repoName),
-          getMilestones(owner, repoName),
-          getPriorities(owner, repoName),
-          getLabels(owner, repoName),
-          countIssue(condition.copy(state = "open"), IssueSearchOption.Issues, owner -> repoName),
-          countIssue(condition.copy(state = "closed"), IssueSearchOption.Issues, owner -> repoName),
-          condition,
-          repository,
-          isIssueEditable(repository),
-          isIssueManageable(repository)
-        )
-    }
+    html.list(
+      "issues",
+      issues.map(issue => (issue, None)),
+      page,
+      getAssignableUserNames(repository.owner, repository.name),
+      getMilestones(repository.owner, repository.name),
+      getPriorities(repository.owner, repository.name),
+      getLabels(repository.owner, repository.name),
+      countIssue(condition.copy(state = "open"), IssueSearchOption.Issues, repository.owner -> repository.name),
+      countIssue(condition.copy(state = "closed"), IssueSearchOption.Issues, repository.owner -> repository.name),
+      condition,
+      repository,
+      isIssueEditable(repository),
+      isIssueManageable(repository)
+    )
  }

  /**
   * Tests whether an issue or a comment is editable by a logged-in user.
   */
-  private def isEditableContent(owner: String, repository: String, author: String)(
+  private def isEditableContent(owner: String, repository: String, author: String, loginAccount: Account)(
    implicit context: Context
  ): Boolean = {
-    hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
+    hasDeveloperRole(owner, repository, context.loginAccount) || author == loginAccount.userName
  }

  /**
   * Tests whether an issue comment is deletable by a logged-in user.
   */
-  private def isDeletableComment(owner: String, repository: String, author: String)(
+  private def isDeletableComment(owner: String, repository: String, author: String, loginAccount: Account)(
    implicit context: Context
  ): Boolean = {
-    hasOwnerRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
+    hasOwnerRole(owner, repository, context.loginAccount) || author == loginAccount.userName
  }
 }
--- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
+++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
@@ -8,7 +8,6 @@ import gitbucket.core.service.IssuesService._
 import gitbucket.core.service.PullRequestService._
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service._
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Directory._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
@@ -58,7 +57,7 @@ trait PullRequestsControllerBase extends ControllerBase {
    with PrioritiesService =>

  val pullRequestForm = mapping(
-    "title" -> trim(label("Title", text(required, maxlength(100)))),
+    "title" -> trim(label("Title", text(required))),
    "content" -> trim(label("Content", optional(text()))),
    "targetUserName" -> trim(text(required, maxlength(100))),
    "targetBranch" -> trim(text(required, maxlength(100))),
@@ -111,24 +110,29 @@ trait PullRequestsControllerBase extends ControllerBase {
  get("/:owner/:repository/pull/:id")(referrersOnly { repository =>
    params("id").toIntOpt.flatMap {
      issueId =>
-        val owner = repository.owner
-        val name = repository.name
-        getPullRequest(owner, name, issueId) map {
+        getPullRequest(repository.owner, repository.name, issueId) map {
          case (issue, pullreq) =>
            val (commits, diffs) =
-              getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
+              getRequestCompareInfo(
+                repository.owner,
+                repository.name,
+                pullreq.commitIdFrom,
+                repository.owner,
+                repository.name,
+                pullreq.commitIdTo
+              )

            html.conversation(
              issue,
              pullreq,
              commits.flatten,
-              getPullRequestComments(owner, name, issue.issueId, commits.flatten),
+              getPullRequestComments(repository.owner, repository.name, issue.issueId, commits.flatten),
              diffs.size,
-              getIssueLabels(owner, name, issueId),
-              getAssignableUserNames(owner, name),
-              getMilestonesWithIssueCount(owner, name),
-              getPriorities(owner, name),
-              getLabels(owner, name),
+              getIssueLabels(repository.owner, repository.name, issueId),
+              getAssignableUserNames(repository.owner, repository.name),
+              getMilestonesWithIssueCount(repository.owner, repository.name),
+              getPriorities(repository.owner, repository.name),
+              getLabels(repository.owner, repository.name),
              isEditable(repository),
              isManageable(repository),
              hasDeveloperRole(pullreq.requestUserName, pullreq.requestRepositoryName, context.loginAccount),
@@ -162,12 +166,17 @@ trait PullRequestsControllerBase extends ControllerBase {
  get("/:owner/:repository/pull/:id/commits")(referrersOnly { repository =>
    params("id").toIntOpt.flatMap {
      issueId =>
-        val owner = repository.owner
-        val name = repository.name
-        getPullRequest(owner, name, issueId) map {
+        getPullRequest(repository.owner, repository.name, issueId) map {
          case (issue, pullreq) =>
            val (commits, diffs) =
-              getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
+              getRequestCompareInfo(
+                repository.owner,
+                repository.name,
+                pullreq.commitIdFrom,
+                repository.owner,
+                repository.name,
+                pullreq.commitIdTo
+              )

            val commitsWithStatus = commits.map { day =>
              day.map { commit =>
@@ -179,7 +188,7 @@ trait PullRequestsControllerBase extends ControllerBase {
              issue,
              pullreq,
              commitsWithStatus,
-              getPullRequestComments(owner, name, issue.issueId, commits.flatten),
+              getPullRequestComments(repository.owner, repository.name, issue.issueId, commits.flatten),
              diffs.size,
              isManageable(repository),
              repository
@@ -191,19 +200,24 @@ trait PullRequestsControllerBase extends ControllerBase {
  get("/:owner/:repository/pull/:id/files")(referrersOnly { repository =>
    params("id").toIntOpt.flatMap {
      issueId =>
-        val owner = repository.owner
-        val name = repository.name
-        getPullRequest(owner, name, issueId) map {
+        getPullRequest(repository.owner, repository.name, issueId) map {
          case (issue, pullreq) =>
            val (commits, diffs) =
-              getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
+              getRequestCompareInfo(
+                repository.owner,
+                repository.name,
+                pullreq.commitIdFrom,
+                repository.owner,
+                repository.name,
+                pullreq.commitIdTo
+              )

            html.files(
              issue,
              pullreq,
              diffs,
              commits.flatten,
-              getPullRequestComments(owner, name, issue.issueId, commits.flatten),
+              getPullRequestComments(repository.owner, repository.name, issue.issueId, commits.flatten),
              isManageable(repository),
              repository
            )
@@ -214,20 +228,20 @@ trait PullRequestsControllerBase extends ControllerBase {
  ajaxGet("/:owner/:repository/pull/:id/mergeguide")(referrersOnly { repository =>
    params("id").toIntOpt.flatMap {
      issueId =>
-        val owner = repository.owner
-        val name = repository.name
-        getPullRequest(owner, name, issueId) map {
+        getPullRequest(repository.owner, repository.name, issueId) map {
          case (issue, pullreq) =>
-            val conflictMessage = LockUtil.lock(s"${owner}/${name}") {
-              checkConflict(owner, name, pullreq.branch, issueId)
+            val conflictMessage = LockUtil.lock(s"${repository.owner}/${repository.name}") {
+              checkConflict(repository.owner, repository.name, pullreq.branch, issueId)
            }
-            val hasMergePermission = hasDeveloperRole(owner, name, context.loginAccount)
-            val branchProtection = getProtectedBranchInfo(owner, name, pullreq.branch)
+            val hasMergePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount)
+            val branchProtection = getProtectedBranchInfo(repository.owner, repository.name, pullreq.branch)
            val mergeStatus = PullRequestService.MergeStatus(
              conflictMessage = conflictMessage,
-              commitStatuses = getCommitStatuses(owner, name, pullreq.commitIdTo),
+              commitStatuses = getCommitStatuses(repository.owner, repository.name, pullreq.commitIdTo),
              branchProtection = branchProtection,
-              branchIsOutOfDate = JGitUtil.getShaByRef(owner, name, pullreq.branch) != Some(pullreq.commitIdFrom),
+              branchIsOutOfDate = JGitUtil.getShaByRef(repository.owner, repository.name, pullreq.branch) != Some(
+                pullreq.commitIdFrom
+              ),
              needStatusCheck = context.loginAccount
                .map { u =>
                  branchProtection.needStatusCheck(u.userName)
@@ -363,23 +377,22 @@ trait PullRequestsControllerBase extends ControllerBase {
  })

  post("/:owner/:repository/pull/:id/merge", mergeForm)(writableUsersOnly { (form, repository) =>
-    params("id").toIntOpt.flatMap { issueId =>
-      val owner = repository.owner
-      val name = repository.name
-
-      mergePullRequest(
-        repository,
-        issueId,
-        context.loginAccount.get,
-        form.message,
-        form.strategy,
-        form.isDraft,
-        context.settings
-      ) match {
-        case Right(objectId) => redirect(s"/${owner}/${name}/pull/${issueId}")
-        case Left(message)   => Some(BadRequest(message))
-      }
-    } getOrElse NotFound()
+    context.withLoginAccount { loginAccount =>
+      params("id").toIntOpt.flatMap { issueId =>
+        mergePullRequest(
+          repository,
+          issueId,
+          loginAccount,
+          form.message,
+          form.strategy,
+          form.isDraft,
+          context.settings
+        ) match {
+          case Right(objectId) => redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+          case Left(message)   => Some(BadRequest(message))
+        }
+      } getOrElse NotFound()
+    }
  })

  get("/:owner/:repository/compare")(referrersOnly { forkedRepository =>
@@ -549,15 +562,14 @@ trait PullRequestsControllerBase extends ControllerBase {
  })

  post("/:owner/:repository/pulls/new", pullRequestForm)(readableUsersOnly { (form, repository) =>
-    defining(repository.owner, repository.name) {
-      case (owner, name) =>
+    context.withLoginAccount {
+      loginAccount =>
        val manageable = isManageable(repository)
-        val loginUserName = context.loginAccount.get.userName

        val issueId = insertIssue(
          owner = repository.owner,
          repository = repository.name,
-          loginUser = loginUserName,
+          loginUser = loginAccount.userName,
          title = form.title,
          content = form.content,
          assignedUserName = if (manageable) form.assignedUserName else None,
@@ -576,14 +588,14 @@ trait PullRequestsControllerBase extends ControllerBase {
          commitIdFrom = form.commitIdFrom,
          commitIdTo = form.commitIdTo,
          isDraft = form.isDraft,
-          loginAccount = context.loginAccount.get,
+          loginAccount = loginAccount,
          settings = context.settings
        )

        // insert labels
        if (manageable) {
          form.labelNames.foreach { value =>
-            val labels = getLabels(owner, name)
+            val labels = getLabels(repository.owner, repository.name)
            value.split(",").foreach { labelName =>
              labels.find(_.labelName == labelName).map { label =>
                registerIssueLabel(repository.owner, repository.name, issueId, label.labelId)
@@ -592,7 +604,7 @@ trait PullRequestsControllerBase extends ControllerBase {
          }
        }

-        redirect(s"/${owner}/${name}/pull/${issueId}")
+        redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
    }
  })

@@ -639,44 +651,42 @@ trait PullRequestsControllerBase extends ControllerBase {
    html.proposals(proposedBranches, targetRepository, repository)
  })

-  private def searchPullRequests(userName: Option[String], repository: RepositoryService.RepositoryInfo) =
-    defining(repository.owner, repository.name) {
-      case (owner, repoName) =>
-        val page = IssueSearchCondition.page(request)
-        // retrieve search condition
-        val condition = IssueSearchCondition(request)
-        // search issues
-        val issues = searchIssue(
-          condition,
-          IssueSearchOption.PullRequests,
-          (page - 1) * PullRequestLimit,
-          PullRequestLimit,
-          owner -> repoName
-        )
-        // commit status
-        val status = issues.map { issue =>
-          issue.commitId.flatMap { commitId =>
-            getCommitStatusWithSummary(owner, repoName, commitId)
-          }
-        }
-
-        gitbucket.core.issues.html.list(
-          "pulls",
-          issues.zip(status),
-          page,
-          getAssignableUserNames(owner, repoName),
-          getMilestones(owner, repoName),
-          getPriorities(owner, repoName),
-          getLabels(owner, repoName),
-          countIssue(condition.copy(state = "open"), IssueSearchOption.PullRequests, owner -> repoName),
-          countIssue(condition.copy(state = "closed"), IssueSearchOption.PullRequests, owner -> repoName),
-          condition,
-          repository,
-          isEditable(repository),
-          isManageable(repository)
-        )
+  private def searchPullRequests(userName: Option[String], repository: RepositoryService.RepositoryInfo) = {
+    val page = IssueSearchCondition.page(request)
+    // retrieve search condition
+    val condition = IssueSearchCondition(request)
+    // search issues
+    val issues = searchIssue(
+      condition,
+      IssueSearchOption.PullRequests,
+      (page - 1) * PullRequestLimit,
+      PullRequestLimit,
+      repository.owner -> repository.name
+    )
+    // commit status
+    val status = issues.map { issue =>
+      issue.commitId.flatMap { commitId =>
+        getCommitStatusWithSummary(repository.owner, repository.name, commitId)
+      }
    }

+    gitbucket.core.issues.html.list(
+      "pulls",
+      issues.zip(status),
+      page,
+      getAssignableUserNames(repository.owner, repository.name),
+      getMilestones(repository.owner, repository.name),
+      getPriorities(repository.owner, repository.name),
+      getLabels(repository.owner, repository.name),
+      countIssue(condition.copy(state = "open"), IssueSearchOption.PullRequests, repository.owner -> repository.name),
+      countIssue(condition.copy(state = "closed"), IssueSearchOption.PullRequests, repository.owner -> repository.name),
+      condition,
+      repository,
+      isEditable(repository),
+      isManageable(repository)
+    )
+  }
+
  /**
   * Tests whether an logged-in user can manage pull requests.
   */
--- a/src/main/scala/gitbucket/core/controller/ReleasesController.scala
+++ b/src/main/scala/gitbucket/core/controller/ReleasesController.scala
@@ -63,8 +63,8 @@ trait ReleaseControllerBase extends ControllerBase {
    )
  })

-  get("/:owner/:repository/releases/:tag")(referrersOnly { repository =>
-    val tagName = params("tag")
+  get("/:owner/:repository/releases/*")(referrersOnly { repository =>
+    val tagName = multiParams("splat").head
    getRelease(repository.owner, repository.name, tagName)
      .map { release =>
        html.release(
@@ -77,8 +77,8 @@ trait ReleaseControllerBase extends ControllerBase {
      .getOrElse(NotFound())
  })

-  get("/:owner/:repository/releases/:tag/assets/:fileId")(referrersOnly { repository =>
-    val tagName = params("tag")
+  get("/:owner/:repository/releases/*/assets/:fileId")(referrersOnly { repository =>
+    val tagName = multiParams("splat").head
    val fileId = params("fileId")
    (for {
      _ <- repository.tags.find(_.name == tagName)
@@ -93,8 +93,8 @@ trait ReleaseControllerBase extends ControllerBase {
    }).getOrElse(NotFound())
  })

-  get("/:owner/:repository/releases/:tag/create")(writableUsersOnly { repository =>
-    val tagName = params("tag")
+  get("/:owner/:repository/releases/*/create")(writableUsersOnly { repository =>
+    val tagName = multiParams("splat").head
    val previousTags = repository.tags.takeWhile(_.name != tagName).reverse

    repository.tags
@@ -105,33 +105,35 @@ trait ReleaseControllerBase extends ControllerBase {
      .getOrElse(NotFound())
  })

-  post("/:owner/:repository/releases/:tag/create", releaseForm)(writableUsersOnly { (form, repository) =>
-    val tagName = params("tag")
-    val loginAccount = context.loginAccount.get
+  post("/:owner/:repository/releases/*/create", releaseForm)(writableUsersOnly { (form, repository) =>
+    context.withLoginAccount {
+      loginAccount =>
+        val tagName = multiParams("splat").head

-    // Insert into RELEASE
-    createRelease(repository.owner, repository.name, form.name, form.content, tagName, loginAccount)
+        // Insert into RELEASE
+        createRelease(repository.owner, repository.name, form.name, form.content, tagName, loginAccount)

-    // Insert into RELEASE_ASSET
-    val files = params.toMap.collect {
-      case (name, value) if name.startsWith("file:") =>
-        val Array(_, fileId) = name.split(":")
-        (fileId, value)
+        // Insert into RELEASE_ASSET
+        val files = params.toMap.collect {
+          case (name, value) if name.startsWith("file:") =>
+            val Array(_, fileId) = name.split(":")
+            (fileId, value)
+        }
+        files.foreach {
+          case (fileId, fileName) =>
+            val size =
+              new File(
+                getReleaseFilesDir(repository.owner, repository.name),
+                FileUtil.checkFilename(tagName + "/" + fileId)
+              ).length
+            createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
+        }
+
+        val releaseInfo = ReleaseInfo(repository.owner, repository.name, loginAccount.userName, form.name, tagName)
+        recordActivity(releaseInfo)
+
+        redirect(s"/${repository.owner}/${repository.name}/releases/${tagName}")
    }
-    files.foreach {
-      case (fileId, fileName) =>
-        val size =
-          new File(
-            getReleaseFilesDir(repository.owner, repository.name),
-            FileUtil.checkFilename(tagName + "/" + fileId)
-          ).length
-        createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
-    }
-
-    val releaseInfo = ReleaseInfo(repository.owner, repository.name, loginAccount.userName, form.name, tagName)
-    recordActivity(releaseInfo)
-
-    redirect(s"/${repository.owner}/${repository.name}/releases/${tagName}")
  })

  get("/:owner/:repository/changelog/*...*")(writableUsersOnly { repository =>
@@ -150,8 +152,8 @@ trait ReleaseControllerBase extends ControllerBase {
    commitLog
  })

-  get("/:owner/:repository/releases/:tag/edit")(writableUsersOnly { repository =>
-    val tagName = params("tag")
+  get("/:owner/:repository/releases/*/edit")(writableUsersOnly { repository =>
+    val tagName = multiParams("splat").head
    val previousTags = repository.tags.takeWhile(_.name != tagName).reverse

    (for {
@@ -168,52 +170,54 @@ trait ReleaseControllerBase extends ControllerBase {
    }).getOrElse(NotFound())
  })

-  post("/:owner/:repository/releases/:tag/edit", releaseForm)(writableUsersOnly {
-    (form, repository) =>
-      val tagName = params("tag")
-      val loginAccount = context.loginAccount.get
+  post("/:owner/:repository/releases/*/edit", releaseForm)(writableUsersOnly { (form, repository) =>
+    context.withLoginAccount {
+      loginAccount =>
+        val tagName = multiParams("splat").head

-      getRelease(repository.owner, repository.name, tagName)
-        .map { release =>
-          // Update RELEASE
-          updateRelease(repository.owner, repository.name, tagName, form.name, form.content)
+        getRelease(repository.owner, repository.name, tagName)
+          .map {
+            release =>
+              // Update RELEASE
+              updateRelease(repository.owner, repository.name, tagName, form.name, form.content)

-          // Delete and Insert RELEASE_ASSET
-          val assets = getReleaseAssets(repository.owner, repository.name, tagName)
-          deleteReleaseAssets(repository.owner, repository.name, tagName)
+              // Delete and Insert RELEASE_ASSET
+              val assets = getReleaseAssets(repository.owner, repository.name, tagName)
+              deleteReleaseAssets(repository.owner, repository.name, tagName)

-          val files = params.toMap.collect {
-            case (name, value) if name.startsWith("file:") =>
-              val Array(_, fileId) = name.split(":")
-              (fileId, value)
+              val files = params.toMap.collect {
+                case (name, value) if name.startsWith("file:") =>
+                  val Array(_, fileId) = name.split(":")
+                  (fileId, value)
+              }
+              files.foreach {
+                case (fileId, fileName) =>
+                  val size =
+                    new File(
+                      getReleaseFilesDir(repository.owner, repository.name),
+                      FileUtil.checkFilename(tagName + "/" + fileId)
+                    ).length
+                  createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
+              }
+
+              assets.foreach { asset =>
+                if (!files.exists { case (fileId, _) => fileId == asset.fileName }) {
+                  val file = new File(
+                    getReleaseFilesDir(repository.owner, repository.name),
+                    FileUtil.checkFilename(release.tag + "/" + asset.fileName)
+                  )
+                  FileUtils.forceDelete(file)
+                }
+              }
+
+              redirect(s"/${release.userName}/${release.repositoryName}/releases/${tagName}")
          }
-          files.foreach {
-            case (fileId, fileName) =>
-              val size =
-                new File(
-                  getReleaseFilesDir(repository.owner, repository.name),
-                  FileUtil.checkFilename(tagName + "/" + fileId)
-                ).length
-              createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount)
-          }
-
-          assets.foreach { asset =>
-            if (!files.exists { case (fileId, _) => fileId == asset.fileName }) {
-              val file = new File(
-                getReleaseFilesDir(repository.owner, repository.name),
-                FileUtil.checkFilename(release.tag + "/" + asset.fileName)
-              )
-              FileUtils.forceDelete(file)
-            }
-          }
-
-          redirect(s"/${release.userName}/${release.repositoryName}/releases/${tagName}")
-        }
-        .getOrElse(NotFound())
+          .getOrElse(NotFound())
+    }
  })

-  post("/:owner/:repository/releases/:tag/delete")(writableUsersOnly { repository =>
-    val tagName = params("tag")
+  post("/:owner/:repository/releases/*/delete")(writableUsersOnly { repository =>
+    val tagName = multiParams("splat").head
    getRelease(repository.owner, repository.name, tagName).foreach { release =>
      FileUtils.deleteDirectory(
        new File(getReleaseFilesDir(repository.owner, repository.name), FileUtil.checkFilename(release.tag))
@@ -224,7 +228,6 @@ trait ReleaseControllerBase extends ControllerBase {
  })

  private def fetchReleases(repository: RepositoryService.RepositoryInfo, page: Int) = {
-
    import gitbucket.core.service.ReleaseService._

    val (offset, limit) = ((page - 1) * ReleaseLimit, ReleaseLimit)
--- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
@@ -1,6 +1,6 @@
 package gitbucket.core.controller

-import java.time.{LocalDateTime, ZoneId, ZoneOffset}
+import java.time.{LocalDateTime, ZoneOffset}
 import java.util.Date

 import gitbucket.core.settings.html
@@ -57,7 +57,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    externalWikiUrl: Option[String],
    allowFork: Boolean,
    mergeOptions: Seq[String],
-    defaultMergeOption: String
+    defaultMergeOption: String,
+    safeMode: Boolean
  )

  val optionsForm = mapping(
@@ -69,7 +70,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
    "externalWikiUrl" -> trim(label("External Wiki URL", optional(text(maxlength(200))))),
    "allowFork" -> trim(label("Allow Forking", boolean())),
    "mergeOptions" -> mergeOptions,
-    "defaultMergeOption" -> trim(label("Default merge strategy", text(required)))
+    "defaultMergeOption" -> trim(label("Default merge strategy", text(required))),
+    "safeMode" -> trim(label("XSS protection", boolean()))
  )(OptionsForm.apply).verifying { form =>
    if (!form.mergeOptions.contains(form.defaultMergeOption)) {
      Seq("defaultMergeOption" -> s"This merge strategy isn't enabled.")
@@ -150,7 +152,8 @@ trait RepositorySettingsControllerBase extends ControllerBase {
      form.externalWikiUrl,
      form.allowFork,
      form.mergeOptions,
-      form.defaultMergeOption
+      form.defaultMergeOption,
+      form.safeMode
    )
    flash.update("info", "Repository settings has been updated.")
    redirect(s"/${repository.owner}/${repository.name}/settings/options")
@@ -342,7 +345,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
                .map(
                  res =>
                    Map(
-                      "status" -> res.getStatusLine(),
+                      "status" -> res.getStatusLine.getStatusCode,
                      "body" -> EntityUtils.toString(res.getEntity()),
                      "headers" -> _headers(res.getAllHeaders())
                  )
@@ -385,54 +388,62 @@ trait RepositorySettingsControllerBase extends ControllerBase {
   * Rename repository.
   */
  post("/:owner/:repository/settings/rename", renameForm)(ownerOnly { (form, repository) =>
-    if (context.settings.repositoryOperation.rename || context.loginAccount.get.isAdmin) {
-      if (repository.name != form.repositoryName) {
-        // Update database and move git repository
-        renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
-        // Record activity log
-        val renameInfo = RenameRepositoryInfo(
-          repository.owner,
-          form.repositoryName,
-          context.loginAccount.get.userName,
-          repository.name
-        )
-        recordActivity(renameInfo)
-      }
-      redirect(s"/${repository.owner}/${form.repositoryName}")
-    } else Forbidden()
+    context.withLoginAccount {
+      loginAccount =>
+        if (context.settings.repositoryOperation.rename || loginAccount.isAdmin) {
+          if (repository.name != form.repositoryName) {
+            // Update database and move git repository
+            renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
+            // Record activity log
+            val renameInfo = RenameRepositoryInfo(
+              repository.owner,
+              form.repositoryName,
+              loginAccount.userName,
+              repository.name
+            )
+            recordActivity(renameInfo)
+          }
+          redirect(s"/${repository.owner}/${form.repositoryName}")
+        } else Forbidden()
+    }
  })

  /**
   * Transfer repository ownership.
   */
  post("/:owner/:repository/settings/transfer", transferForm)(ownerOnly { (form, repository) =>
-    if (context.settings.repositoryOperation.transfer || context.loginAccount.get.isAdmin) {
-      // Change repository owner
-      if (repository.owner != form.newOwner) {
-        // Update database and move git repository
-        renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
-        // Record activity log
-        val renameInfo = RenameRepositoryInfo(
-          form.newOwner,
-          repository.name,
-          context.loginAccount.get.userName,
-          repository.owner
-        )
-        recordActivity(renameInfo)
-      }
-      redirect(s"/${form.newOwner}/${repository.name}")
-    } else Forbidden()
+    context.withLoginAccount {
+      loginAccount =>
+        if (context.settings.repositoryOperation.transfer || loginAccount.isAdmin) {
+          // Change repository owner
+          if (repository.owner != form.newOwner) {
+            // Update database and move git repository
+            renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
+            // Record activity log
+            val renameInfo = RenameRepositoryInfo(
+              form.newOwner,
+              repository.name,
+              loginAccount.userName,
+              repository.owner
+            )
+            recordActivity(renameInfo)
+          }
+          redirect(s"/${form.newOwner}/${repository.name}")
+        } else Forbidden()
+    }
  })

  /**
   * Delete the repository.
   */
  post("/:owner/:repository/settings/delete")(ownerOnly { repository =>
-    if (context.settings.repositoryOperation.delete || context.loginAccount.get.isAdmin) {
-      // Delete the repository and related files
-      deleteRepository(repository.repository)
-      redirect(s"/${repository.owner}")
-    } else Forbidden()
+    context.withLoginAccount { loginAccount =>
+      if (context.settings.repositoryOperation.delete || loginAccount.isAdmin) {
+        // Delete the repository and related files
+        deleteRepository(repository.repository)
+        redirect(s"/${repository.owner}")
+      } else Forbidden()
+    }
  })

  /**
--- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
@@ -1,7 +1,6 @@
 package gitbucket.core.controller

 import java.io.{File, FileInputStream, FileOutputStream}
-
 import scala.util.Using
 import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
 import gitbucket.core.repo.html
@@ -11,12 +10,11 @@ import gitbucket.core.service._
 import gitbucket.core.service.RepositoryCommitFileService.CommitFile
 import gitbucket.core.util._
 import gitbucket.core.util.StringUtil._
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.Directory._
-import gitbucket.core.model.Account
+import gitbucket.core.model.{Account, WebHook}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
-import gitbucket.core.util.JGitUtil.CommitInfo
+import gitbucket.core.service.WebHookService.{WebHookCreatePayload, WebHookPushPayload}
 import gitbucket.core.view
 import gitbucket.core.view.helpers
 import org.apache.commons.compress.archivers.{ArchiveEntry, ArchiveOutputStream}
@@ -221,11 +219,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      gitbucket.core.repo.html.creating(owner, repository)
    } else {
      params.get("go-get") match {
-        case Some("1") =>
-          defining(request.paths) { paths =>
-            getRepository(owner, repository).map(gitbucket.core.html.goget(_)) getOrElse NotFound()
-          }
-        case _ => referrersOnly(fileList(_))
+        case Some("1") => getRepository(owner, repository).map(gitbucket.core.html.goget(_)) getOrElse NotFound()
+        case _         => referrersOnly(fileList(_))
      }
    }
  }
@@ -271,26 +266,12 @@ trait RepositoryViewerControllerBase extends ControllerBase {
              branchName,
              repository,
              logs
-                .map {
-                  commit =>
-                    (
-                      CommitInfo(
-                        id = commit.id,
-                        shortMessage = commit.shortMessage,
-                        fullMessage = commit.fullMessage,
-                        parents = commit.parents,
-                        authorTime = commit.authorTime,
-                        authorName = commit.authorName,
-                        authorEmailAddress = commit.authorEmailAddress,
-                        commitTime = commit.commitTime,
-                        committerName = commit.committerName,
-                        committerEmailAddress = commit.committerEmailAddress,
-                        commitSign = commit.commitSign,
-                        verified = commit.commitSign.flatMap(GpgUtil.verifySign)
-                      ),
-                      JGitUtil.getTagsOnCommit(git, commit.id),
-                      getCommitStatusWithSummary(repository.owner, repository.name, commit.id)
-                    )
+                .map { commit =>
+                  (
+                    commit.copy(verified = commit.commitSign.flatMap(GpgUtil.verifySign)),
+                    JGitUtil.getTagsOnCommit(git, commit.id),
+                    getCommitStatusWithSummary(repository.owner, repository.name, commit.id)
+                  )
                }
                .splitWith {
                  case ((commit1, _, _), (commit2, _, _)) =>
@@ -306,74 +287,99 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  })

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

-    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+        Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+          val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))

-      html.editor(
-        branch = branch,
-        repository = repository,
-        pathList = if (path.length == 0) Nil else path.split("/").toList,
-        fileName = None,
-        content = JGitUtil.ContentInfo("text", None, None, Some("UTF-8")),
-        protectedBranch = protectedBranch,
-        commit = revCommit.getName
-      )
+          html.editor(
+            branch = branch,
+            repository = repository,
+            pathList = if (path.length == 0) Nil else path.split("/").toList,
+            fileName = None,
+            content = JGitUtil.ContentInfo("text", None, None, Some("UTF-8")),
+            protectedBranch = protectedBranch,
+            commit = revCommit.getName
+          )
+        }
    }
  })

  get("/:owner/:repository/upload/*")(writableUsersOnly { repository =>
-    val (branch, path) = repository.splitPath(multiParams("splat").head)
-    val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch)
-      .needStatusCheck(context.loginAccount.get.userName)
-    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
-      html.upload(
-        branch,
-        repository,
-        if (path.length == 0) Nil else path.split("/").toList,
-        protectedBranch,
-        revCommit.name
-      )
+    context.withLoginAccount {
+      loginAccount =>
+        val (branch, path) = repository.splitPath(multiParams("splat").head)
+        val protectedBranch = getProtectedBranchInfo(repository.owner, repository.name, branch)
+          .needStatusCheck(loginAccount.userName)
+        Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+          val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+          html.upload(
+            branch,
+            repository,
+            if (path.length == 0) Nil else path.split("/").toList,
+            protectedBranch,
+            revCommit.name
+          )
+        }
    }
  })

  post("/:owner/:repository/upload", uploadForm)(writableUsersOnly { (form, repository) =>
-    val files = form.uploadFiles.split("\n").map { line =>
-      val i = line.indexOf(':')
-      CommitFile(line.substring(0, i).trim, line.substring(i + 1).trim)
+    context.withLoginAccount {
+      loginAccount =>
+        val files = form.uploadFiles
+          .split("\n")
+          .map { line =>
+            val i = line.indexOf(':')
+            CommitFile(line.substring(0, i).trim, line.substring(i + 1).trim)
+          }
+          .toSeq
+
+        val newFiles = files.map { file =>
+          file.copy(name = if (form.path.length == 0) file.name else s"${form.path}/${file.name}")
+        }
+
+        if (form.newBranch) {
+          val newBranchName = createNewBranchForPullRequest(repository, form.branch, loginAccount)
+          val objectId = _commit(newBranchName, newFiles, loginAccount)
+          val issueId =
+            createIssueAndPullRequest(
+              repository,
+              form.branch,
+              newBranchName,
+              form.commit,
+              objectId.name,
+              form.message,
+              loginAccount
+            )
+          redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+        } else {
+          _commit(form.branch, newFiles, loginAccount)
+          if (form.path.length == 0) {
+            redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}")
+          } else {
+            redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}/${form.path}")
+          }
+        }
    }

-    val newFiles = files.map { file =>
-      file.copy(name = if (form.path.length == 0) file.name else s"${form.path}/${file.name}")
-    }
-
-    if (form.newBranch) {
-      val newBranchName = createNewBranchForPullRequest(repository, form.branch)
-      val objectId = _commit(newBranchName)
-      val issueId =
-        createIssueAndPullRequest(repository, form.branch, newBranchName, form.commit, objectId.name, form.message)
-      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
-    } else {
-      _commit(form.branch)
-      if (form.path.length == 0) {
-        redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}")
-      } else {
-        redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}/${form.path}")
-      }
-    }
-
-    def _commit(branchName: String): ObjectId = {
+    def _commit(
+      branchName: String,
+      //files: Seq[CommitFile],
+      newFiles: Seq[CommitFile],
+      loginAccount: Account
+    ): ObjectId = {
      commitFiles(
        repository = repository,
        branch = branchName,
-        path = form.path,
-        files = files.toIndexedSeq,
+        //path = form.path,
+        //files = files.toIndexedSeq,
        message = form.message.getOrElse("Add files via upload"),
-        loginAccount = context.loginAccount.get,
+        loginAccount = loginAccount,
        settings = context.settings
      ) {
        case (git, headTip, builder, inserter) =>
@@ -396,32 +402,36 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  })

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

-    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
-      git =>
-        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+        Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+          git =>
+            val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))

-        getPathObjectId(git, path, revCommit).map {
-          objectId =>
-            val paths = path.split("/")
-            val info = EditorConfigUtil.getEditorConfigInfo(git, branch, path)
+            getPathObjectId(git, path, revCommit)
+              .map {
+                objectId =>
+                  val paths = path.split("/")
+                  val info = EditorConfigUtil.getEditorConfigInfo(git, branch, path)

-            html.editor(
-              branch = branch,
-              repository = repository,
-              pathList = paths.take(paths.size - 1).toList,
-              fileName = Some(paths.last),
-              content = JGitUtil.getContentInfo(git, path, objectId),
-              protectedBranch = protectedBranch,
-              commit = revCommit.getName,
-              newLineMode = info.newLineMode,
-              useSoftTabs = info.useSoftTabs,
-              tabSize = info.tabSize
-            )
-        } getOrElse NotFound()
+                  html.editor(
+                    branch = branch,
+                    repository = repository,
+                    pathList = paths.take(paths.size - 1).toList,
+                    fileName = Some(paths.last),
+                    content = JGitUtil.getContentInfo(git, path, objectId, repository.repository.options.safeMode),
+                    protectedBranch = protectedBranch,
+                    commit = revCommit.getName,
+                    newLineMode = info.newLineMode,
+                    useSoftTabs = info.useSoftTabs,
+                    tabSize = info.tabSize
+                  )
+              } getOrElse NotFound()
+        }
    }
  })

@@ -438,7 +448,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            repository = repository,
            pathList = paths.take(paths.size - 1).toList,
            fileName = paths.last,
-            content = JGitUtil.getContentInfo(git, path, objectId),
+            content = JGitUtil.getContentInfo(git, path, objectId, repository.repository.options.safeMode),
            commit = revCommit.getName
          )
        } getOrElse NotFound()
@@ -446,21 +456,32 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  })

  post("/:owner/:repository/create", editorForm)(writableUsersOnly { (form, repository) =>
-    if (form.newBranch) {
-      val newBranchName = createNewBranchForPullRequest(repository, form.branch)
-      val objectId = _commit(newBranchName)
-      val issueId =
-        createIssueAndPullRequest(repository, form.branch, newBranchName, form.commit, objectId.name, form.message)
-      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
-    } else {
-      _commit(form.branch)
-      redirect(
-        s"/${repository.owner}/${repository.name}/blob/${form.branch}/${if (form.path.length == 0) urlEncode(form.newFileName)
-        else s"${form.path}/${urlEncode(form.newFileName)}"}"
-      )
+    context.withLoginAccount {
+      loginAccount =>
+        if (form.newBranch) {
+          val newBranchName = createNewBranchForPullRequest(repository, form.branch, loginAccount)
+          val objectId = _commit(newBranchName, loginAccount)
+          val issueId =
+            createIssueAndPullRequest(
+              repository,
+              form.branch,
+              newBranchName,
+              form.commit,
+              objectId.name,
+              form.message,
+              loginAccount
+            )
+          redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+        } else {
+          _commit(form.branch, loginAccount)
+          redirect(
+            s"/${repository.owner}/${repository.name}/blob/${form.branch}/${if (form.path.length == 0) urlEncode(form.newFileName)
+            else s"${form.path}/${urlEncode(form.newFileName)}"}"
+          )
+        }
    }

-    def _commit(branchName: String): ObjectId = {
+    def _commit(branchName: String, loginAccount: Account): ObjectId = {
      commitFile(
        repository = repository,
        branch = branchName,
@@ -471,28 +492,39 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        charset = form.charset,
        message = form.message.getOrElse(s"Create ${form.newFileName}"),
        commit = form.commit,
-        loginAccount = context.loginAccount.get,
+        loginAccount = loginAccount,
        settings = context.settings
-      )
+      )._1
    }
  })

  post("/:owner/:repository/update", editorForm)(writableUsersOnly { (form, repository) =>
-    if (form.newBranch) {
-      val newBranchName = createNewBranchForPullRequest(repository, form.branch)
-      val objectId = _commit(newBranchName)
-      val issueId =
-        createIssueAndPullRequest(repository, form.branch, newBranchName, form.commit, objectId.name, form.message)
-      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
-    } else {
-      _commit(form.branch)
-      redirect(
-        s"/${repository.owner}/${repository.name}/blob/${urlEncode(form.branch)}/${if (form.path.length == 0) urlEncode(form.newFileName)
-        else s"${form.path}/${urlEncode(form.newFileName)}"}"
-      )
+    context.withLoginAccount {
+      loginAccount =>
+        if (form.newBranch) {
+          val newBranchName = createNewBranchForPullRequest(repository, form.branch, loginAccount)
+          val objectId = _commit(newBranchName, loginAccount)
+          val issueId =
+            createIssueAndPullRequest(
+              repository,
+              form.branch,
+              newBranchName,
+              form.commit,
+              objectId.name,
+              form.message,
+              loginAccount
+            )
+          redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+        } else {
+          _commit(form.branch, loginAccount)
+          redirect(
+            s"/${repository.owner}/${repository.name}/blob/${urlEncode(form.branch)}/${if (form.path.length == 0) urlEncode(form.newFileName)
+            else s"${form.path}/${urlEncode(form.newFileName)}"}"
+          )
+        }
    }

-    def _commit(branchName: String): ObjectId = {
+    def _commit(branchName: String, loginAccount: Account): ObjectId = {
      commitFile(
        repository = repository,
        branch = branchName,
@@ -507,28 +539,39 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          form.message.getOrElse(s"Rename ${form.oldFileName.get} to ${form.newFileName}")
        },
        commit = form.commit,
-        loginAccount = context.loginAccount.get,
+        loginAccount = loginAccount,
        settings = context.settings
-      )
+      )._1
    }
  })

  post("/:owner/:repository/remove", deleteForm)(writableUsersOnly { (form, repository) =>
-    if (form.newBranch) {
-      val newBranchName = createNewBranchForPullRequest(repository, form.branch)
-      val objectId = _commit(newBranchName)
-      val issueId =
-        createIssueAndPullRequest(repository, form.branch, newBranchName, form.commit, objectId.name, form.message)
-      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
-    } else {
-      _commit(form.branch)
-      redirect(
-        s"/${repository.owner}/${repository.name}/tree/${form.branch}${if (form.path.length == 0) ""
-        else "/" + form.path}"
-      )
+    context.withLoginAccount {
+      loginAccount =>
+        if (form.newBranch) {
+          val newBranchName = createNewBranchForPullRequest(repository, form.branch, loginAccount)
+          val objectId = _commit(newBranchName, loginAccount)
+          val issueId =
+            createIssueAndPullRequest(
+              repository,
+              form.branch,
+              newBranchName,
+              form.commit,
+              objectId.name,
+              form.message,
+              loginAccount
+            )
+          redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+        } else {
+          _commit(form.branch, loginAccount)
+          redirect(
+            s"/${repository.owner}/${repository.name}/tree/${form.branch}${if (form.path.length == 0) ""
+            else "/" + form.path}"
+          )
+        }
    }

-    def _commit(branchName: String): ObjectId = {
+    def _commit(branchName: String, loginAccount: Account): ObjectId = {
      commitFile(
        repository = repository,
        branch = branchName,
@@ -539,26 +582,46 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        charset = "",
        message = form.message.getOrElse(s"Delete ${form.fileName}"),
        commit = form.commit,
-        loginAccount = context.loginAccount.get,
+        loginAccount = loginAccount,
        settings = context.settings
-      )
+      )._1
    }
  })

-  private def getNewBranchName(repository: RepositoryInfo): String = {
+  private def getNewBranchName(repository: RepositoryInfo, loginAccount: Account): String = {
    var i = 1
-    val branchNamePrefix = cutTail(context.loginAccount.get.userName.replaceAll("[^a-zA-Z0-9-_]", "-"), 25)
+    val branchNamePrefix = cutTail(loginAccount.userName.replaceAll("[^a-zA-Z0-9-_]", "-"), 25)
    while (repository.branchList.exists(p => p.contains(s"$branchNamePrefix-patch-$i"))) {
      i += 1
    }
    s"$branchNamePrefix-patch-$i"
  }

-  private def createNewBranchForPullRequest(repository: RepositoryInfo, baseBranchName: String): String = {
-    val newBranchName = getNewBranchName(repository)
+  private def createNewBranchForPullRequest(
+    repository: RepositoryInfo,
+    baseBranchName: String,
+    loginAccount: Account
+  ): String = {
+    val newBranchName = getNewBranchName(repository, loginAccount)
    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
      JGitUtil.createBranch(git, baseBranchName, newBranchName)
    }
+    // Call webhook
+    val settings = loadSystemSettings()
+    callWebHookOf(repository.owner, repository.name, WebHook.Create, settings) {
+      for {
+        sender <- Some(loginAccount)
+        owner <- getAccountByUserName(repository.owner)
+      } yield {
+        WebHookCreatePayload(
+          sender,
+          repository,
+          owner,
+          ref = newBranchName,
+          refType = "branch"
+        )
+      }
+    }
    newBranchName
  }

@@ -568,12 +631,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    requestBranch: String,
    commitIdFrom: String,
    commitIdTo: String,
-    commitMessage: Option[String]
+    commitMessage: Option[String],
+    loginAccount: Account
  ): Int = {
    val issueId = insertIssue(
      owner = repository.owner,
      repository = repository.name,
-      loginUser = context.loginAccount.get.userName,
+      loginUser = loginAccount.userName,
      title = requestBranch,
      content = commitMessage,
      assignedUserName = None,
@@ -591,7 +655,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      commitIdFrom = commitIdFrom,
      commitIdTo = commitIdTo,
      isDraft = false,
-      loginAccount = context.loginAccount.get,
+      loginAccount = loginAccount,
      settings = context.settings
    )
    issueId
@@ -629,7 +693,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
                branch = id,
                repository = repository,
                pathList = path.split("/").toList,
-                content = JGitUtil.getContentInfo(git, path, objectId),
+                content = JGitUtil.getContentInfo(git, path, objectId, repository.repository.options.safeMode),
                latestCommit = new JGitUtil.CommitInfo(JGitUtil.getLastModifiedCommit(git, revCommit, path)),
                hasWritePermission = hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
                isBlame = request.paths(2) == "blame",
@@ -704,26 +768,24 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    try {
      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
        git =>
-          defining(JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))) {
-            revCommit =>
-              val diffs = JGitUtil.getDiffs(git, None, id, true, false)
-              val oldCommitId = JGitUtil.getParentCommitId(git, id)
+          val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
+          val diffs = JGitUtil.getDiffs(git, None, id, true, false)
+          val oldCommitId = JGitUtil.getParentCommitId(git, id)

-              html.commit(
-                id,
-                new JGitUtil.CommitInfo(revCommit),
-                JGitUtil.getBranchesOfCommit(git, revCommit.getName),
-                JGitUtil.getTagsOfCommit(git, revCommit.getName),
-                getCommitStatusWithSummary(repository.owner, repository.name, revCommit.getName),
-                getCommitComments(repository.owner, repository.name, id, true),
-                repository,
-                diffs,
-                oldCommitId,
-                hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
-                flash.get("info"),
-                flash.get("error")
-              )
-          }
+          html.commit(
+            id,
+            new JGitUtil.CommitInfo(revCommit),
+            JGitUtil.getBranchesOfCommit(git, revCommit.getName),
+            JGitUtil.getTagsOfCommit(git, revCommit.getName),
+            getCommitStatusWithSummary(repository.owner, repository.name, revCommit.getName),
+            getCommitComments(repository.owner, repository.name, id, true),
+            repository,
+            diffs,
+            oldCommitId,
+            hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
+            flash.get("info"),
+            flash.get("error")
+          )
      }
    } catch {
      case e: MissingObjectException => NotFound()
@@ -756,20 +818,22 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  })

  post("/:owner/:repository/commit/:id/comment/new", commentForm)(readableUsersOnly { (form, repository) =>
-    val id = params("id")
-    createCommitComment(
-      repository,
-      id,
-      context.loginAccount.get,
-      form.content,
-      form.fileName,
-      form.oldLineNumber,
-      form.newLineNumber,
-      form.diff,
-      form.issueId
-    )
+    context.withLoginAccount { loginAccount =>
+      val id = params("id")
+      createCommitComment(
+        repository,
+        id,
+        loginAccount,
+        form.content,
+        form.fileName,
+        form.oldLineNumber,
+        form.newLineNumber,
+        form.diff,
+        form.issueId
+      )

-    redirect(s"/${repository.owner}/${repository.name}/commit/${id}")
+      redirect(s"/${repository.owner}/${repository.name}/commit/${id}")
+    }
  })

  ajaxGet("/:owner/:repository/commit/:id/comment/_form")(readableUsersOnly { repository =>
@@ -791,72 +855,77 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  })

  ajaxPost("/:owner/:repository/commit/:id/comment/_data/new", commentForm)(readableUsersOnly { (form, repository) =>
-    val id = params("id")
-    val commentId = createCommitComment(
-      repository,
-      id,
-      context.loginAccount.get,
-      form.content,
-      form.fileName,
-      form.oldLineNumber,
-      form.newLineNumber,
-      form.diff,
-      form.issueId
-    )
+    context.withLoginAccount {
+      loginAccount =>
+        val id = params("id")
+        val commentId = createCommitComment(
+          repository,
+          id,
+          loginAccount,
+          form.content,
+          form.fileName,
+          form.oldLineNumber,
+          form.newLineNumber,
+          form.diff,
+          form.issueId
+        )

-    val comment = getCommitComment(repository.owner, repository.name, commentId.toString).get
-    helper.html
-      .commitcomment(comment, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), repository)
+        val comment = getCommitComment(repository.owner, repository.name, commentId.toString).get
+        helper.html
+          .commitcomment(comment, hasDeveloperRole(repository.owner, repository.name, context.loginAccount), repository)
+    }
  })

  ajaxGet("/:owner/:repository/commit_comments/_data/:id")(readableUsersOnly { repository =>
-    getCommitComment(repository.owner, repository.name, params("id")) map {
-      x =>
-        if (isEditable(x.userName, x.repositoryName, x.commentedUserName)) {
-          params.get("dataType") collect {
-            case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
-          } getOrElse {
-            contentType = formats("json")
-            org.json4s.jackson.Serialization.write(
-              Map(
-                "content" -> view.Markdown.toHtml(
-                  markdown = x.content,
-                  repository = repository,
-                  branch = repository.repository.defaultBranch,
-                  enableWikiLink = false,
-                  enableRefsLink = true,
-                  enableAnchor = true,
-                  enableLineBreaks = true,
-                  enableTaskList = true,
-                  hasWritePermission = true
+    context.withLoginAccount {
+      loginAccount =>
+        getCommitComment(repository.owner, repository.name, params("id")) map {
+          x =>
+            if (isEditable(x.userName, x.repositoryName, x.commentedUserName, loginAccount)) {
+              params.get("dataType") collect {
+                case t if t == "html" => html.editcomment(x.content, x.commentId, repository)
+              } getOrElse {
+                contentType = formats("json")
+                org.json4s.jackson.Serialization.write(
+                  Map(
+                    "content" -> view.Markdown.toHtml(
+                      markdown = x.content,
+                      repository = repository,
+                      branch = repository.repository.defaultBranch,
+                      enableWikiLink = false,
+                      enableRefsLink = true,
+                      enableAnchor = true,
+                      enableLineBreaks = true,
+                      enableTaskList = true,
+                      hasWritePermission = true
+                    )
+                  )
                )
-              )
-            )
-          }
-        } else Unauthorized()
-    } getOrElse NotFound()
+              }
+            } else Unauthorized()
+        } getOrElse NotFound()
+    }
  })

  ajaxPost("/:owner/:repository/commit_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
-    defining(repository.owner, repository.name) {
-      case (owner, name) =>
-        getCommitComment(owner, name, params("id")).map { comment =>
-          if (isEditable(owner, name, comment.commentedUserName)) {
+    context.withLoginAccount {
+      loginAccount =>
+        getCommitComment(repository.owner, repository.name, params("id")).map { comment =>
+          if (isEditable(repository.owner, repository.name, comment.commentedUserName, loginAccount)) {
            updateCommitComment(comment.commentId, form.content)
-            redirect(s"/${owner}/${name}/commit_comments/_data/${comment.commentId}")
+            redirect(s"/${repository.owner}/${repository.name}/commit_comments/_data/${comment.commentId}")
          } else Unauthorized()
        } getOrElse NotFound()
    }
  })

  ajaxPost("/:owner/:repository/commit_comments/delete/:id")(readableUsersOnly { repository =>
-    defining(repository.owner, repository.name) {
-      case (owner, name) =>
-        getCommitComment(owner, name, params("id")).map { comment =>
-          if (isEditable(owner, name, comment.commentedUserName)) {
-            Ok(deleteCommitComment(comment.commentId))
-          } else Unauthorized()
-        } getOrElse NotFound()
+    context.withLoginAccount { loginAccount =>
+      getCommitComment(repository.owner, repository.name, params("id")).map { comment =>
+        if (isEditable(repository.owner, repository.name, comment.commentedUserName, loginAccount)) {
+          Ok(deleteCommitComment(comment.commentId))
+        } else Unauthorized()
+      } getOrElse NotFound()
    }
  })

@@ -924,17 +993,54 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  post("/:owner/:repository/branches")(writableUsersOnly { repository =>
    val newBranchName = params.getOrElse("new", halt(400))
    val fromBranchName = params.getOrElse("from", halt(400))
-    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-      JGitUtil.createBranch(git, fromBranchName, newBranchName)
-    } match {
-      case Right(message) =>
-        flash.update("info", message)
-        redirect(
-          s"/${repository.owner}/${repository.name}/tree/${StringUtil.urlEncode(newBranchName).replace("%2F", "/")}"
-        )
-      case Left(message) =>
-        flash.update("error", message)
-        redirect(s"/${repository.owner}/${repository.name}/tree/${fromBranchName}")
+    Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) {
+      git =>
+        JGitUtil.createBranch(git, fromBranchName, newBranchName) match {
+          case Right(message) =>
+            flash.update("info", message)
+            val settings = loadSystemSettings()
+            val newCommitId = git.getRepository.resolve(s"refs/heads/${newBranchName}")
+            val oldCommitId = ObjectId.fromString("0" * 40)
+            // call push webhook
+            callWebHookOf(repository.owner, repository.name, WebHook.Push, settings) {
+              for {
+                pusherAccount <- context.loginAccount
+                ownerAccount <- getAccountByUserName(repository.owner)
+              } yield {
+                WebHookPushPayload(
+                  git,
+                  pusherAccount,
+                  newBranchName,
+                  repository,
+                  List(),
+                  ownerAccount,
+                  newId = newCommitId,
+                  oldId = oldCommitId
+                )
+              }
+            }
+            // call create webhook
+            callWebHookOf(repository.owner, repository.name, WebHook.Create, settings) {
+              for {
+                sender <- context.loginAccount
+                owner <- getAccountByUserName(repository.owner)
+              } yield {
+                WebHookCreatePayload(
+                  sender,
+                  repository,
+                  owner,
+                  ref = newBranchName,
+                  refType = "branch"
+                )
+              }
+            }
+            redirect(
+              s"/${repository.owner}/${repository.name}/tree/${StringUtil.urlEncode(newBranchName).replace("%2F", "/")}"
+            )
+          case Left(message) =>
+            flash.update("error", message)
+            redirect(s"/${repository.owner}/${repository.name}/tree/${fromBranchName}")
+        }
    }
  })

@@ -942,16 +1048,19 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   * Deletes branch.
   */
  get("/:owner/:repository/delete/*")(writableUsersOnly { repository =>
-    val branchName = multiParams("splat").head
-    val userName = context.loginAccount.get.userName
-    if (repository.repository.defaultBranch != branchName) {
-      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-        git.branchDelete().setForce(true).setBranchNames(branchName).call()
-        val deleteBranchInfo = DeleteBranchInfo(repository.owner, repository.name, userName, branchName)
-        recordActivity(deleteBranchInfo)
-      }
+    context.withLoginAccount {
+      loginAccount =>
+        val branchName = multiParams("splat").head
+        if (repository.repository.defaultBranch != branchName) {
+          Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+            git.branchDelete().setForce(true).setBranchNames(branchName).call()
+            val deleteBranchInfo =
+              DeleteBranchInfo(repository.owner, repository.name, loginAccount.userName, branchName)
+            recordActivity(deleteBranchInfo)
+          }
+        }
+        redirect(s"/${repository.owner}/${repository.name}/branches")
    }
-    redirect(s"/${repository.owner}/${repository.name}/branches")
  })

  /**
@@ -1037,54 +1146,53 @@ trait RepositoryViewerControllerBase extends ControllerBase {
        // get specified commit
        JGitUtil.getDefaultBranch(git, repository, revstr).map {
          case (objectId, revision) =>
-            defining(JGitUtil.getRevCommitFromId(git, objectId)) { revCommit =>
-              val lastModifiedCommit =
-                if (path == ".") revCommit else JGitUtil.getLastModifiedCommit(git, revCommit, path)
-              val commitCount = JGitUtil.getCommitCount(git, lastModifiedCommit.getName)
-              // get files
-              val files = JGitUtil.getFileList(
-                git,
-                revision,
-                path,
-                context.settings.baseUrl,
-                commitCount,
-                context.settings.repositoryViewer.maxFiles
-              )
-              val parentPath = if (path == ".") Nil else path.split("/").toList
-              // process README
-              val readme = files // files should be sorted alphabetically.
-                .find { file =>
-                  !file.isDirectory && RepositoryService.readmeFiles.contains(file.name.toLowerCase)
-                }
-                .map { file =>
-                  val path = (file.name :: parentPath.reverse).reverse
-                  path -> StringUtil.convertFromByteArray(
-                    JGitUtil
-                      .getContentFromId(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true)
-                      .get
-                  )
-                }
+            val revCommit = JGitUtil.getRevCommitFromId(git, objectId)
+            val lastModifiedCommit =
+              if (path == ".") revCommit else JGitUtil.getLastModifiedCommit(git, revCommit, path)
+            val commitCount = JGitUtil.getCommitCount(git, lastModifiedCommit.getName)
+            // get files
+            val files = JGitUtil.getFileList(
+              git,
+              revision,
+              path,
+              context.settings.baseUrl,
+              commitCount,
+              context.settings.repositoryViewer.maxFiles
+            )
+            val parentPath = if (path == ".") Nil else path.split("/").toList
+            // process README
+            val readme = files // files should be sorted alphabetically.
+              .find { file =>
+                !file.isDirectory && RepositoryService.readmeFiles.contains(file.name.toLowerCase)
+              }
+              .map { file =>
+                val path = (file.name :: parentPath.reverse).reverse
+                path -> StringUtil.convertFromByteArray(
+                  JGitUtil
+                    .getContentFromId(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true)
+                    .get
+                )
+              }

-              html.files(
-                revision,
-                repository,
-                if (path == ".") Nil else path.split("/").toList, // current path
-                new JGitUtil.CommitInfo(lastModifiedCommit), // last modified commit
-                getCommitStatusWithSummary(repository.owner, repository.name, lastModifiedCommit.getName),
-                commitCount,
-                files,
-                readme,
-                hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
-                getPullRequestFromBranch(
-                  repository.owner,
-                  repository.name,
-                  revstr,
-                  repository.repository.defaultBranch
-                ),
-                flash.get("info"),
-                flash.get("error")
-              )
-            }
+            html.files(
+              revision,
+              repository,
+              if (path == ".") Nil else path.split("/").toList, // current path
+              new JGitUtil.CommitInfo(lastModifiedCommit), // last modified commit
+              getCommitStatusWithSummary(repository.owner, repository.name, lastModifiedCommit.getName),
+              commitCount,
+              files,
+              readme,
+              hasDeveloperRole(repository.owner, repository.name, context.loginAccount),
+              getPullRequestFromBranch(
+                repository.owner,
+                repository.name,
+                revstr,
+                repository.repository.defaultBranch
+              ),
+              flash.get("info"),
+              flash.get("error")
+            )
        } getOrElse NotFound()
      }
    }
@@ -1115,34 +1223,37 @@ trait RepositoryViewerControllerBase extends ControllerBase {
          }
          if (treeWalk != null) {
            while (treeWalk.next()) {
-              val entryPath =
-                if (path.isEmpty) baseName + "/" + treeWalk.getPathString
-                else path.split("/").last + treeWalk.getPathString.substring(path.length)
-              val mode = treeWalk.getFileMode.getBits
-              JGitUtil.openFile(git, repository, commit.getTree, treeWalk.getPathString) { in =>
-                val tempFile = File.createTempFile("gitbucket", ".archive")
-                val size = Using.resource(new FileOutputStream(tempFile)) { out =>
-                  IOUtils.copy(
-                    EolStreamTypeUtil.wrapInputStream(
-                      in,
-                      EolStreamTypeUtil
-                        .detectStreamType(
-                          OperationType.CHECKOUT_OP,
-                          git.getRepository.getConfig.get(WorkingTreeOptions.KEY),
-                          treeWalk.getAttributes
-                        )
-                    ),
-                    out
-                  )
-                }
+              if (treeWalk.getFileMode != FileMode.GITLINK) {
+                val entryPath =
+                  if (path.isEmpty) baseName + "/" + treeWalk.getPathString
+                  else path.split("/").last + treeWalk.getPathString.substring(path.length)
+                val mode = treeWalk.getFileMode.getBits

-                val entry: ArchiveEntry = entryCreator(entryPath, size, date, mode)
-                archive.putArchiveEntry(entry)
-                Using.resource(new FileInputStream(tempFile)) { in =>
-                  IOUtils.copy(in, archive)
+                JGitUtil.openFile(git, repository, commit.getTree, treeWalk.getPathString) { in =>
+                  val tempFile = File.createTempFile("gitbucket", ".archive")
+                  val size = Using.resource(new FileOutputStream(tempFile)) { out =>
+                    IOUtils.copy(
+                      EolStreamTypeUtil.wrapInputStream(
+                        in,
+                        EolStreamTypeUtil
+                          .detectStreamType(
+                            OperationType.CHECKOUT_OP,
+                            git.getRepository.getConfig.get(WorkingTreeOptions.KEY),
+                            treeWalk.getAttributes
+                          )
+                      ),
+                      out
+                    )
+                  }
+
+                  val entry: ArchiveEntry = entryCreator(entryPath, size, date, mode)
+                  archive.putArchiveEntry(entry)
+                  Using.resource(new FileInputStream(tempFile)) { in =>
+                    IOUtils.copy(in, archive)
+                  }
+                  archive.closeArchiveEntry()
+                  tempFile.delete()
                }
-                archive.closeArchiveEntry()
-                tempFile.delete()
              }
            }
          }
@@ -1204,8 +1315,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    }
  }

-  private def isEditable(owner: String, repository: String, author: String)(implicit context: Context): Boolean =
-    hasDeveloperRole(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
+  private def isEditable(owner: String, repository: String, author: String, loginAccount: Account): Boolean = {
+    hasDeveloperRole(owner, repository, Some(loginAccount)) || author == loginAccount.userName
+  }

  private def conflict: Constraint = new Constraint() {
    override def validate(name: String, value: String, messages: Messages): Option[String] = {
--- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
+++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
@@ -9,7 +9,6 @@ import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.ssh.SshServer
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.StringUtil._
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.{AdminAuthenticator, Mailer}
 import org.apache.commons.io.IOUtils
 import org.apache.commons.mail.EmailException
@@ -463,31 +462,28 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  })

  get("/admin/users/:groupName/_editgroup")(adminOnly {
-    defining(params("groupName")) { groupName =>
-      html.usergroup(getAccountByUserName(groupName, true), getGroupMembers(groupName))
-    }
+    val groupName = params("groupName")
+    html.usergroup(getAccountByUserName(groupName, true), getGroupMembers(groupName))
  })

  post("/admin/users/:groupName/_editgroup", editGroupForm)(adminOnly { form =>
-    defining(
-      params("groupName"),
-      form.members
-        .split(",")
-        .map {
-          _.split(":") match {
-            case Array(userName, isManager) => (userName, isManager.toBoolean)
-          }
+    val groupName = params("groupName")
+    val members = form.members
+      .split(",")
+      .map {
+        _.split(":") match {
+          case Array(userName, isManager) => (userName, isManager.toBoolean)
        }
-        .toList
-    ) {
-      case (groupName, members) =>
-        getAccountByUserName(groupName, true).map {
-          account =>
-            updateGroup(groupName, form.description, form.url, form.isRemoved)
+      }
+      .toList

-            if (form.isRemoved) {
-              // Remove from GROUP_MEMBER
-              updateGroupMembers(form.groupName, Nil)
+    getAccountByUserName(groupName, true).map {
+      account =>
+        updateGroup(groupName, form.description, form.url, form.isRemoved)
+
+        if (form.isRemoved) {
+          // Remove from GROUP_MEMBER
+          updateGroupMembers(form.groupName, Nil)
 //          // Remove repositories
 //          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
 //            deleteRepository(groupName, repositoryName)
@@ -495,9 +491,9 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 //            FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
 //            FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
 //          }
-            } else {
-              // Update GROUP_MEMBER
-              updateGroupMembers(form.groupName, members)
+        } else {
+          // Update GROUP_MEMBER
+          updateGroupMembers(form.groupName, members)
 //          // Update COLLABORATOR for group repositories
 //          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
 //            removeCollaborators(form.groupName, repositoryName)
@@ -505,13 +501,12 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
 //              addCollaborator(form.groupName, repositoryName, userName)
 //            }
 //          }
-            }
+        }

-            updateImage(form.groupName, form.fileId, form.clearImage)
-            redirect("/admin/users")
+        updateImage(form.groupName, form.fileId, form.clearImage)
+        redirect("/admin/users")

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

  get("/admin/data")(adminOnly {
@@ -559,12 +554,11 @@ trait SystemSettingsControllerBase extends AccountManagementControllerBase {
  protected def disableByNotYourself(paramName: String): Constraint =
    new Constraint() {
      override def validate(name: String, value: String, messages: Messages): Option[String] = {
-        params.get(paramName).flatMap { userName =>
-          if (userName == context.loginAccount.get.userName && params.get("removed") == Some("true"))
-            Some("You can't disable your account yourself")
-          else
-            None
-        }
+        for {
+          userName <- params.get(paramName)
+          loginAccount <- context.loginAccount
+          if userName == loginAccount.userName && params.get("removed") == Some("true")
+        } yield "You can't disable your account yourself"
      }
    }

--- a/src/main/scala/gitbucket/core/controller/WikiController.scala
+++ b/src/main/scala/gitbucket/core/controller/WikiController.scala
@@ -136,32 +136,38 @@ trait WikiControllerBase extends ControllerBase {
  })

  get("/:owner/:repository/wiki/:page/_revert/:commitId")(readableUsersOnly { repository =>
-    if (isEditable(repository)) {
-      val pageName = StringUtil.urlDecode(params("page"))
-      val Array(from, to) = params("commitId").split("\\.\\.\\.")
+    context.withLoginAccount {
+      loginAccount =>
+        if (isEditable(repository)) {
+          val pageName = StringUtil.urlDecode(params("page"))
+          val Array(from, to) = params("commitId").split("\\.\\.\\.")

-      if (revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, Some(pageName))) {
-        redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}")
-      } else {
-        flash.update("info", "This patch was not able to be reversed.")
-        redirect(
-          s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_compare/${from}...${to}"
-        )
-      }
-    } else Unauthorized()
+          if (revertWikiPage(repository.owner, repository.name, from, to, loginAccount, Some(pageName))) {
+            redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}")
+          } else {
+            flash.update("info", "This patch was not able to be reversed.")
+            redirect(
+              s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_compare/${from}...${to}"
+            )
+          }
+        } else Unauthorized()
+    }
  })

  get("/:owner/:repository/wiki/_revert/:commitId")(readableUsersOnly { repository =>
-    if (isEditable(repository)) {
-      val Array(from, to) = params("commitId").split("\\.\\.\\.")
+    context.withLoginAccount {
+      loginAccount =>
+        if (isEditable(repository)) {
+          val Array(from, to) = params("commitId").split("\\.\\.\\.")

-      if (revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, None)) {
-        redirect(s"/${repository.owner}/${repository.name}/wiki")
-      } else {
-        flash.update("info", "This patch was not able to be reversed.")
-        redirect(s"/${repository.owner}/${repository.name}/wiki/_compare/${from}...${to}")
-      }
-    } else Unauthorized()
+          if (revertWikiPage(repository.owner, repository.name, from, to, loginAccount, None)) {
+            redirect(s"/${repository.owner}/${repository.name}/wiki")
+          } else {
+            flash.update("info", "This patch was not able to be reversed.")
+            redirect(s"/${repository.owner}/${repository.name}/wiki/_compare/${from}...${to}")
+          }
+        } else Unauthorized()
+    }
  })

  get("/:owner/:repository/wiki/:page/_edit")(readableUsersOnly { repository =>
@@ -172,9 +178,9 @@ trait WikiControllerBase extends ControllerBase {
  })

  post("/:owner/:repository/wiki/_edit", editForm)(readableUsersOnly { (form, repository) =>
-    if (isEditable(repository)) {
-      defining(context.loginAccount.get) {
-        loginAccount =>
+    context.withLoginAccount {
+      loginAccount =>
+        if (isEditable(repository)) {
          saveWikiPage(
            repository.owner,
            repository.name,
@@ -201,8 +207,8 @@ trait WikiControllerBase extends ControllerBase {
          } else {
            redirect(s"/${repository.owner}/${repository.name}/wiki")
          }
-      }
-    } else Unauthorized()
+        } else Unauthorized()
+    }
  })

  get("/:owner/:repository/wiki/_new")(readableUsersOnly { repository =>
@@ -212,9 +218,9 @@ trait WikiControllerBase extends ControllerBase {
  })

  post("/:owner/:repository/wiki/_new", newForm)(readableUsersOnly { (form, repository) =>
-    if (isEditable(repository)) {
-      defining(context.loginAccount.get) {
-        loginAccount =>
+    context.withLoginAccount {
+      loginAccount =>
+        if (isEditable(repository)) {
          saveWikiPage(
            repository.owner,
            repository.name,
@@ -242,27 +248,35 @@ trait WikiControllerBase extends ControllerBase {
          } else {
            redirect(s"/${repository.owner}/${repository.name}/wiki")
          }
-      }
-    } else Unauthorized()
+        } else Unauthorized()
+    }
  })

  get("/:owner/:repository/wiki/:page/_delete")(readableUsersOnly { repository =>
-    if (isEditable(repository)) {
-      val pageName = StringUtil.urlDecode(params("page"))
+    context.withLoginAccount {
+      loginAccount =>
+        if (isEditable(repository)) {
+          val pageName = StringUtil.urlDecode(params("page"))
+          deleteWikiPage(
+            repository.owner,
+            repository.name,
+            pageName,
+            loginAccount.fullName,
+            loginAccount.mailAddress,
+            s"Destroyed ${pageName}"
+          )
+          val deleteWikiInfo = DeleteWikiInfo(
+            repository.owner,
+            repository.name,
+            loginAccount.userName,
+            pageName
+          )
+          recordActivity(deleteWikiInfo)
+          updateLastActivityDate(repository.owner, repository.name)

-      defining(context.loginAccount.get) { loginAccount =>
-        val deleteWikiInfo = DeleteWikiInfo(
-          repository.owner,
-          repository.name,
-          loginAccount.userName,
-          pageName
-        )
-        recordActivity(deleteWikiInfo)
-        updateLastActivityDate(repository.owner, repository.name)
-
-        redirect(s"/${repository.owner}/${repository.name}/wiki")
-      }
-    } else Unauthorized()
+          redirect(s"/${repository.owner}/${repository.name}/wiki")
+        } else Unauthorized()
+    }
  })

  get("/:owner/:repository/wiki/_pages")(referrersOnly { repository =>
--- a/src/main/scala/gitbucket/core/controller/api/ApiIssueCommentControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiIssueCommentControllerBase.scala
@@ -4,7 +4,7 @@ import gitbucket.core.controller.{Context, ControllerBase}
 import gitbucket.core.service._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, RepositoryName}
-import org.scalatra.{ActionResult, NoContent}
+import org.scalatra.ActionResult

 trait ApiIssueCommentControllerBase extends ControllerBase {
  self: AccountService
--- a/src/main/scala/gitbucket/core/controller/api/ApiIssueControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiIssueControllerBase.scala
@@ -5,7 +5,7 @@ import gitbucket.core.model.{Account, Issue}
 import gitbucket.core.service.{AccountService, IssueCreationService, IssuesService, MilestonesService}
 import gitbucket.core.service.IssuesService.IssueSearchCondition
 import gitbucket.core.service.PullRequestService.PullRequestLimit
-import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, RepositoryName, UsersAuthenticator}
+import gitbucket.core.util.{ReadableUsersAuthenticator, ReferrerAuthenticator, RepositoryName}
 import gitbucket.core.util.Implicits._

 trait ApiIssueControllerBase extends ControllerBase {
--- a/src/main/scala/gitbucket/core/controller/api/ApiOrganizationControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiOrganizationControllerBase.scala
@@ -1,5 +1,5 @@
 package gitbucket.core.controller.api
-import gitbucket.core.api.{ApiGroup, CreateAGroup, ApiRepository, ApiUser, JsonFormat}
+import gitbucket.core.api.{ApiGroup, CreateAGroup, JsonFormat}
 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.util.Implicits._
--- a/src/main/scala/gitbucket/core/controller/api/ApiReleaseControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiReleaseControllerBase.scala
@@ -1,5 +1,5 @@
 package gitbucket.core.controller.api
-import java.io.{ByteArrayInputStream, File}
+import java.io.File

 import gitbucket.core.api._
 import gitbucket.core.controller.ControllerBase
@@ -7,9 +7,8 @@ import gitbucket.core.service.{AccountService, ReleaseService}
 import gitbucket.core.util.Directory.getReleaseFilesDir
 import gitbucket.core.util.{FileUtil, ReferrerAuthenticator, RepositoryName, WritableUsersAuthenticator}
 import gitbucket.core.util.Implicits._
-import gitbucket.core.util.SyntaxSugars.defining
 import org.apache.commons.io.FileUtils
-import org.scalatra.{Created, NoContent}
+import org.scalatra.NoContent

 trait ApiReleaseControllerBase extends ControllerBase {
  self: AccountService with ReleaseService with ReferrerAuthenticator with WritableUsersAuthenticator =>
@@ -120,41 +119,40 @@ trait ApiReleaseControllerBase extends ControllerBase {
   * ix. Upload a release asset
   * https://developer.github.com/v3/repos/releases/#upload-a-release-asset
   */
-  post("/api/v3/repos/:owner/:repository/releases/:tag/assets")(writableUsersOnly { repository =>
-    val name = params("name")
-    val tag = params("tag")
-    getRelease(repository.owner, repository.name, tag)
-      .map {
-        release =>
-          defining(FileUtil.generateFileId) { fileId =>
-            val buf = new Array[Byte](request.inputStream.available())
-            request.inputStream.read(buf)
-            FileUtils.writeByteArrayToFile(
-              new File(
-                getReleaseFilesDir(repository.owner, repository.name),
-                FileUtil.checkFilename(tag + "/" + fileId)
-              ),
-              buf
-            )
-            createReleaseAsset(
-              repository.owner,
-              repository.name,
-              tag,
-              fileId,
-              name,
-              request.contentLength.getOrElse(0),
-              context.loginAccount.get
-            )
-            getReleaseAsset(repository.owner, repository.name, tag, fileId)
-              .map { asset =>
-                JsonFormat(ApiReleaseAsset(asset, RepositoryName(repository)))
-              }
-              .getOrElse {
-                ApiError("Unknown error")
-              }
-          }
-      }
-      .getOrElse(NotFound())
+  post("/api/v3/repos/:owner/:repository/releases/:tag/assets")(writableUsersOnly {
+    repository =>
+      val name = params("name")
+      val tag = params("tag")
+      getRelease(repository.owner, repository.name, tag)
+        .map { release =>
+          val fileId = FileUtil.generateFileId
+          val buf = new Array[Byte](request.inputStream.available())
+          request.inputStream.read(buf)
+          FileUtils.writeByteArrayToFile(
+            new File(
+              getReleaseFilesDir(repository.owner, repository.name),
+              FileUtil.checkFilename(tag + "/" + fileId)
+            ),
+            buf
+          )
+          createReleaseAsset(
+            repository.owner,
+            repository.name,
+            tag,
+            fileId,
+            name,
+            request.contentLength.getOrElse(0),
+            context.loginAccount.get
+          )
+          getReleaseAsset(repository.owner, repository.name, tag, fileId)
+            .map { asset =>
+              JsonFormat(ApiReleaseAsset(asset, RepositoryName(repository)))
+            }
+            .getOrElse {
+              ApiError("Unknown error")
+            }
+        }
+        .getOrElse(NotFound())
  })

  /**
--- a/src/main/scala/gitbucket/core/controller/api/ApiRepositoryContentsControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiRepositoryContentsControllerBase.scala
@@ -1,10 +1,9 @@
 package gitbucket.core.controller.api
-import gitbucket.core.api.{ApiContents, ApiError, CreateAFile, JsonFormat}
+import gitbucket.core.api.{ApiCommit, ApiContents, ApiError, CreateAFile, JsonFormat}
 import gitbucket.core.controller.ControllerBase
-import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.{RepositoryCommitFileService, RepositoryService}
 import gitbucket.core.util.Directory.getRepositoryDir
-import gitbucket.core.util.JGitUtil.{FileInfo, getContentFromId, getFileList}
+import gitbucket.core.util.JGitUtil.{CommitInfo, FileInfo, getContentFromId, getFileList}
 import gitbucket.core.util._
 import gitbucket.core.view.helpers.{isRenderable, renderMarkup}
 import gitbucket.core.util.Implicits._
@@ -36,7 +35,7 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {

  /**
   * ii. Get contents
-   * https://developer.github.com/v3/repos/contents/#get-contents
+   * https://docs.github.com/en/rest/reference/repos#get-repository-content
   */
  get("/api/v3/repos/:owner/:repository/contents")(referrersOnly { repository =>
    getContents(repository, ".", params.getOrElse("ref", repository.repository.defaultBranch))
@@ -44,34 +43,34 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {

  /**
   * ii. Get contents
-   * https://developer.github.com/v3/repos/contents/#get-contents
+   * https://docs.github.com/en/rest/reference/repos#get-repository-content
   */
  get("/api/v3/repos/:owner/:repository/contents/*")(referrersOnly { repository =>
    getContents(repository, multiParams("splat").head, params.getOrElse("ref", repository.repository.defaultBranch))
  })

+  private def getFileInfo(git: Git, revision: String, pathStr: String, ignoreCase: Boolean): Option[FileInfo] = {
+    val (dirName, fileName) = pathStr.lastIndexOf('/') match {
+      case -1 =>
+        (".", pathStr)
+      case n =>
+        (pathStr.take(n), pathStr.drop(n + 1))
+    }
+    if (ignoreCase) {
+      getFileList(git, revision, dirName, maxFiles = context.settings.repositoryViewer.maxFiles)
+        .find(_.name.toLowerCase.equals(fileName.toLowerCase))
+    } else {
+      getFileList(git, revision, dirName, maxFiles = context.settings.repositoryViewer.maxFiles)
+        .find(_.name.equals(fileName))
+    }
+  }
+
  private def getContents(
    repository: RepositoryService.RepositoryInfo,
    path: String,
    refStr: String,
    ignoreCase: Boolean = false
  ) = {
-    def getFileInfo(git: Git, revision: String, pathStr: String, ignoreCase: Boolean): Option[FileInfo] = {
-      val (dirName, fileName) = pathStr.lastIndexOf('/') match {
-        case -1 =>
-          (".", pathStr)
-        case n =>
-          (pathStr.take(n), pathStr.drop(n + 1))
-      }
-      if (ignoreCase) {
-        getFileList(git, revision, dirName, maxFiles = context.settings.repositoryViewer.maxFiles)
-          .find(_.name.toLowerCase.equals(fileName.toLowerCase))
-      } else {
-        getFileList(git, revision, dirName, maxFiles = context.settings.repositoryViewer.maxFiles)
-          .find(_.name.equals(fileName))
-      }
-    }
-
    Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) { git =>
      val fileList = getFileList(git, refStr, path, maxFiles = context.settings.repositoryViewer.maxFiles)
      if (fileList.isEmpty) { // file or NotFound
@@ -127,56 +126,88 @@ trait ApiRepositoryContentsControllerBase extends ControllerBase {
      }
    }
  }
-  /*
+
+  /**
   * iii. Create a file or iv. Update a file
-   * https://developer.github.com/v3/repos/contents/#create-a-file
-   * https://developer.github.com/v3/repos/contents/#update-a-file
+   * https://docs.github.com/en/rest/reference/repos#create-or-update-file-contents
   * if sha is presented, update a file else create a file.
   * requested #2112
   */
-
  put("/api/v3/repos/:owner/:repository/contents/*")(writableUsersOnly { repository =>
-    JsonFormat(for {
-      data <- extractFromJsonBody[CreateAFile]
-    } yield {
-      val branch = data.branch.getOrElse(repository.repository.defaultBranch)
-      val commit = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
-        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
-        revCommit.name
-      }
-      val paths = multiParams("splat").head.split("/")
-      val path = paths.take(paths.size - 1).toList.mkString("/")
-      if (data.sha.isDefined && data.sha.get != commit) {
-        ApiError("The blob SHA is not matched.", Some("https://developer.github.com/v3/repos/contents/#update-a-file"))
-      } else {
-        val objectId = commitFile(
-          repository,
-          branch,
-          path,
-          Some(paths.last),
-          data.sha.map(_ => paths.last),
-          StringUtil.base64Decode(data.content),
-          data.message,
-          commit,
-          context.loginAccount.get,
-          data.committer.map(_.name).getOrElse(context.loginAccount.get.fullName),
-          data.committer.map(_.email).getOrElse(context.loginAccount.get.mailAddress),
-          context.settings
-        )
-        ApiContents("file", paths.last, path, objectId.name, None, None)(RepositoryName(repository))
-      }
-    })
+    context.withLoginAccount {
+      loginAccount =>
+        JsonFormat(for {
+          data <- extractFromJsonBody[CreateAFile]
+        } yield {
+          val branch = data.branch.getOrElse(repository.repository.defaultBranch)
+          val commit = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
+            val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+            revCommit.name
+          }
+          val paths = multiParams("splat").head.split("/")
+          val path = paths.take(paths.size - 1).toList.mkString("/")
+          Using.resource(Git.open(getRepositoryDir(params("owner"), params("repository")))) {
+            git =>
+              val fileInfo = getFileInfo(git, commit, path, false)
+
+              fileInfo match {
+                case Some(f) if !data.sha.contains(f.id.getName) =>
+                  ApiError(
+                    "The blob SHA is not matched.",
+                    Some("https://docs.github.com/en/rest/reference/repos#create-or-update-file-contents")
+                  )
+                case _ =>
+                  val (commitId, blobId) = commitFile(
+                    repository,
+                    branch,
+                    path,
+                    Some(paths.last),
+                    data.sha.map(_ => paths.last),
+                    StringUtil.base64Decode(data.content),
+                    data.message,
+                    commit,
+                    loginAccount,
+                    data.committer.map(_.name).getOrElse(loginAccount.fullName),
+                    data.committer.map(_.email).getOrElse(loginAccount.mailAddress),
+                    context.settings
+                  )
+
+                  blobId match {
+                    case None =>
+                      ApiError("Failed to commit a file.", None)
+                    case Some(blobId) =>
+                      Map(
+                        "content" -> ApiContents(
+                          "file",
+                          paths.last,
+                          path,
+                          blobId.name,
+                          Some(data.content),
+                          Some("base64")
+                        )(RepositoryName(repository)),
+                        "commit" -> ApiCommit(
+                          git,
+                          RepositoryName(repository),
+                          new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+                        )
+                      )
+                  }
+              }
+          }
+        })
+    }
  })

  /*
   * v. Delete a file
-   * https://developer.github.com/v3/repos/contents/#delete-a-file
+   * https://docs.github.com/en/rest/reference/repos#delete-a-file
   * should be implemented
   */

  /*
- * vi. Get archive link
- * https://developer.github.com/v3/repos/contents/#get-archive-link
+ * vi. Download a repository archive (tar/zip)
+ * https://docs.github.com/en/rest/reference/repos#download-a-repository-archive-tar
+ * https://docs.github.com/en/rest/reference/repos#download-a-repository-archive-zip
 */

 }
--- a/src/main/scala/gitbucket/core/controller/api/ApiRepositoryControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiRepositoryControllerBase.scala
@@ -8,6 +8,7 @@ import gitbucket.core.util._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import org.eclipse.jgit.api.Git
+import org.scalatra.Forbidden

 import scala.concurrent.Await
 import scala.concurrent.duration.Duration
@@ -26,7 +27,7 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /**
   * i. List your repositories
-   * https://developer.github.com/v3/repos/#list-your-repositories
+   * https://docs.github.com/en/rest/reference/repos#list-repositories-for-the-authenticated-user
   */
  get("/api/v3/user/repos")(usersOnly {
    JsonFormat(getVisibleRepositories(context.loginAccount, Option(context.loginAccount.get.userName)).map { r =>
@@ -36,7 +37,7 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /**
   * ii. List user repositories
-   * https://developer.github.com/v3/repos/#list-user-repositories
+   * https://docs.github.com/en/rest/reference/repos#list-repositories-for-a-user
   */
  get("/api/v3/users/:userName/repos") {
    JsonFormat(getVisibleRepositories(context.loginAccount, Some(params("userName"))).map { r =>
@@ -46,7 +47,7 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /**
   * iii. List organization repositories
-   * https://developer.github.com/v3/repos/#list-organization-repositories
+   * https://docs.github.com/en/rest/reference/repos#list-organization-repositories
   */
  get("/api/v3/orgs/:orgName/repos") {
    JsonFormat(getVisibleRepositories(context.loginAccount, Some(params("orgName"))).map { r =>
@@ -56,7 +57,7 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /**
   * iv. List all public repositories
-   * https://developer.github.com/v3/repos/#list-public-repositories
+   * https://docs.github.com/en/rest/reference/repos#list-public-repositories
   */
  get("/api/v3/repositories") {
    JsonFormat(getPublicRepositories().map { r =>
@@ -66,13 +67,12 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /*
   * v. Create
-   * https://developer.github.com/v3/repos/#create
   * Implemented with two methods (user/orgs)
   */

  /**
   * Create user repository
-   * https://developer.github.com/v3/repos/#create
+   * https://docs.github.com/en/rest/reference/repos#create-a-repository-for-the-authenticated-user
   */
  post("/api/v3/user/repos")(usersOnly {
    val owner = context.loginAccount.get.userName
@@ -80,7 +80,12 @@ trait ApiRepositoryControllerBase extends ControllerBase {
      data <- extractFromJsonBody[CreateARepository] if data.isValid
    } yield {
      LockUtil.lock(s"${owner}/${data.name}") {
-        if (getRepository(owner, data.name).isEmpty) {
+        if (getRepository(owner, data.name).isDefined) {
+          ApiError(
+            "A repository with this name already exists on this account",
+            Some("https://developer.github.com/v3/repos/#create")
+          )
+        } else {
          val f = createRepository(
            context.loginAccount.get,
            owner,
@@ -95,11 +100,6 @@ trait ApiRepositoryControllerBase extends ControllerBase {
            getRepository(owner, data.name)(session).get
          }
          JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(owner).get)))
-        } else {
-          ApiError(
-            "A repository with this name already exists on this account",
-            Some("https://developer.github.com/v3/repos/#create")
-          )
        }
      }
    }) getOrElse NotFound()
@@ -107,15 +107,22 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /**
   * Create group repository
-   * https://developer.github.com/v3/repos/#create
+   * https://docs.github.com/en/rest/reference/repos#create-an-organization-repository
   */
-  post("/api/v3/orgs/:org/repos")(managersOnly {
+  post("/api/v3/orgs/:org/repos")(usersOnly {
    val groupName = params("org")
    (for {
      data <- extractFromJsonBody[CreateARepository] if data.isValid
    } yield {
      LockUtil.lock(s"${groupName}/${data.name}") {
-        if (getRepository(groupName, data.name).isEmpty) {
+        if (getRepository(groupName, data.name).isDefined) {
+          ApiError(
+            "A repository with this name already exists for this group",
+            Some("https://developer.github.com/v3/repos/#create")
+          )
+        } else if (!canCreateRepository(groupName, context.loginAccount.get)) {
+          Forbidden()
+        } else {
          val f = createRepository(
            context.loginAccount.get,
            groupName,
@@ -129,11 +136,6 @@ trait ApiRepositoryControllerBase extends ControllerBase {
            getRepository(groupName, data.name).get
          }
          JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(groupName).get)))
-        } else {
-          ApiError(
-            "A repository with this name already exists for this group",
-            Some("https://developer.github.com/v3/repos/#create")
-          )
        }
      }
    }) getOrElse NotFound()
@@ -141,7 +143,7 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /*
   * vi. Get
-   * https://developer.github.com/v3/repos/#get
+   * https://docs.github.com/en/rest/reference/repos#get-a-repository
   */
  get("/api/v3/repos/:owner/:repository")(referrersOnly { repository =>
    JsonFormat(ApiRepository(repository, ApiUser(getAccountByUserName(repository.owner).get)))
@@ -149,32 +151,32 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /*
   * vii. Edit
-   * https://developer.github.com/v3/repos/#edit
+   * https://docs.github.com/en/rest/reference/repos#update-a-repository
   */

  /*
   * viii. List all topics for a repository
-   * https://developer.github.com/v3/repos/#list-all-topics-for-a-repository
+   * https://docs.github.com/en/rest/reference/repos#get-all-repository-topics
   */

  /*
   * ix. Replace all topics for a repository
-   * https://developer.github.com/v3/repos/#replace-all-topics-for-a-repository
+   * https://docs.github.com/en/rest/reference/repos#replace-all-repository-topics
   */

  /*
   * x. List contributors
-   * https://developer.github.com/v3/repos/#list-contributors
+   * https://docs.github.com/en/rest/reference/repos#list-repository-contributors
   */

  /*
   * xi. List languages
-   * https://developer.github.com/v3/repos/#list-languages
+   * https://docs.github.com/en/rest/reference/repos#list-repository-languages
   */

  /*
   * xii. List teams
-   * https://developer.github.com/v3/repos/#list-teams
+   * https://docs.github.com/en/rest/reference/repos#list-repository-teams
   */

  /*
@@ -189,12 +191,12 @@ trait ApiRepositoryControllerBase extends ControllerBase {

  /*
   * xiv. Delete a repository
-   * https://developer.github.com/v3/repos/#delete-a-repository
+   * https://docs.github.com/en/rest/reference/repos#delete-a-repository
   */

  /*
   * xv. Transfer a repository
-   * https://developer.github.com/v3/repos/#transfer-a-repository
+   * https://docs.github.com/en/rest/reference/repos#transfer-a-repository
   */

  /**
--- a/src/main/scala/gitbucket/core/controller/api/ApiUserControllerBase.scala
+++ b/src/main/scala/gitbucket/core/controller/api/ApiUserControllerBase.scala
@@ -104,7 +104,7 @@ trait ApiUserControllerBase extends ControllerBase {
   */
  delete("/api/v3/users/:userName/suspended")(adminOnly {
    val userName = params("userName")
-    getAccountByUserName(userName) match {
+    getAccountByUserName(userName, true) match {
      case Some(targetAccount) =>
        updateAccount(targetAccount.copy(isRemoved = false))
        NoContent()
--- a/src/main/scala/gitbucket/core/model/AccountWebHook.scala
+++ b/src/main/scala/gitbucket/core/model/AccountWebHook.scala
@@ -3,7 +3,7 @@ package gitbucket.core.model
 trait AccountWebHookComponent extends TemplateComponent { self: Profile =>
  import profile.api._

-  private implicit val whContentTypeColumnType =
+  private implicit val whContentTypeColumnType: BaseColumnType[WebHookContentType] =
    MappedColumnType.base[WebHookContentType, String](whct => whct.code, code => WebHookContentType.valueOf(code))

  lazy val AccountWebHooks = TableQuery[AccountWebHooks]
--- a/src/main/scala/gitbucket/core/model/AccountWebHookEvent.scala
+++ b/src/main/scala/gitbucket/core/model/AccountWebHookEvent.scala
@@ -1,8 +1,6 @@
 package gitbucket.core.model

-trait AccountWebHookEventComponent extends TemplateComponent {
-  self: Profile =>
-
+trait AccountWebHookEventComponent extends TemplateComponent { self: Profile =>
  import profile.api._
  import gitbucket.core.model.Profile.AccountWebHooks

--- a/src/main/scala/gitbucket/core/model/CommitStatus.scala
+++ b/src/main/scala/gitbucket/core/model/CommitStatus.scala
@@ -4,7 +4,8 @@ trait CommitStatusComponent extends TemplateComponent { self: Profile =>
  import profile.api._
  import self._

-  implicit val commitStateColumnType = MappedColumnType.base[CommitState, String](b => b.name, i => CommitState(i))
+  implicit val commitStateColumnType: BaseColumnType[CommitState] =
+    MappedColumnType.base[CommitState, String](b => b.name, i => CommitState(i))

  lazy val CommitStatuses = TableQuery[CommitStatuses]
  class CommitStatuses(tag: Tag) extends Table[CommitStatus](tag, "COMMIT_STATUS") with CommitTemplate {
@@ -77,7 +78,7 @@ object CommitState {

  val values: Vector[CommitState] = Vector(PENDING, SUCCESS, ERROR, FAILURE)

-  private val map: Map[String, CommitState] = values.map(enum => enum.name -> enum).toMap
+  private val map: Map[String, CommitState] = values.map(e => e.name -> e).toMap

  def apply(name: String): CommitState = map(name)

--- a/src/main/scala/gitbucket/core/model/Profile.scala
+++ b/src/main/scala/gitbucket/core/model/Profile.scala
@@ -10,15 +10,17 @@ trait Profile {
  /**
   * java.util.Date Mapped Column Types
   */
-  implicit val dateColumnType = MappedColumnType.base[java.util.Date, java.sql.Timestamp](
-    d => new java.sql.Timestamp(d.getTime),
-    t => new java.util.Date(t.getTime)
-  )
+  implicit val dateColumnType: BaseColumnType[java.util.Date] =
+    MappedColumnType.base[java.util.Date, java.sql.Timestamp](
+      d => new java.sql.Timestamp(d.getTime),
+      t => new java.util.Date(t.getTime)
+    )

  /**
   * WebHookBase.Event Column Types
   */
-  implicit val eventColumnType = MappedColumnType.base[WebHook.Event, String](_.name, WebHook.Event.valueOf(_))
+  implicit val eventColumnType: BaseColumnType[WebHook.Event] =
+    MappedColumnType.base[WebHook.Event, String](_.name, WebHook.Event.valueOf(_))

  /**
   * Extends Column to add conditional condition
--- a/src/main/scala/gitbucket/core/model/ReleaseAsset.scala
+++ b/src/main/scala/gitbucket/core/model/ReleaseAsset.scala
@@ -2,9 +2,7 @@ package gitbucket.core.model

 import java.util.Date

-trait ReleaseAssetComponent extends TemplateComponent {
-  self: Profile =>
-
+trait ReleaseAssetComponent extends TemplateComponent { self: Profile =>
  import profile.api._
  import self._

--- a/src/main/scala/gitbucket/core/model/ReleaseTag.scala
+++ b/src/main/scala/gitbucket/core/model/ReleaseTag.scala
@@ -1,8 +1,6 @@
 package gitbucket.core.model

-trait ReleaseTagComponent extends TemplateComponent {
-  self: Profile =>
-
+trait ReleaseTagComponent extends TemplateComponent { self: Profile =>
  import profile.api._
  import self._

--- a/src/main/scala/gitbucket/core/model/Repository.scala
+++ b/src/main/scala/gitbucket/core/model/Repository.scala
@@ -24,6 +24,7 @@ trait RepositoryComponent extends TemplateComponent { self: Profile =>
    val allowFork = column[Boolean]("ALLOW_FORK")
    val mergeOptions = column[String]("MERGE_OPTIONS")
    val defaultMergeOption = column[String]("DEFAULT_MERGE_OPTION")
+    val safeMode = column[Boolean]("SAFE_MODE")

    def * =
      (
@@ -41,7 +42,16 @@ trait RepositoryComponent extends TemplateComponent { self: Profile =>
          parentUserName.?,
          parentRepositoryName.?
        ),
-        (issuesOption, externalIssuesUrl.?, wikiOption, externalWikiUrl.?, allowFork, mergeOptions, defaultMergeOption)
+        (
+          issuesOption,
+          externalIssuesUrl.?,
+          wikiOption,
+          externalWikiUrl.?,
+          allowFork,
+          mergeOptions,
+          defaultMergeOption,
+          safeMode
+        )
      ).shaped.<>(
        {
          case (repository, options) =>
@@ -112,5 +122,6 @@ case class RepositoryOptions(
  externalWikiUrl: Option[String],
  allowFork: Boolean,
  mergeOptions: String,
-  defaultMergeOption: String
+  defaultMergeOption: String,
+  safeMode: Boolean
 )
--- a/src/main/scala/gitbucket/core/model/RepositoryWebHook.scala
+++ b/src/main/scala/gitbucket/core/model/RepositoryWebHook.scala
@@ -3,7 +3,7 @@ package gitbucket.core.model
 trait RepositoryWebHookComponent extends TemplateComponent { self: Profile =>
  import profile.api._

-  implicit val whContentTypeColumnType =
+  implicit val whContentTypeColumnType: BaseColumnType[WebHookContentType] =
    MappedColumnType.base[WebHookContentType, String](whct => whct.code, code => WebHookContentType.valueOf(code))

  lazy val RepositoryWebHooks = TableQuery[RepositoryWebHooks]
--- a/src/main/scala/gitbucket/core/model/WebHook.scala
+++ b/src/main/scala/gitbucket/core/model/WebHook.scala
@@ -8,7 +8,7 @@ object WebHookContentType {

  val values: Vector[WebHookContentType] = Vector(JSON, FORM)

-  private val map: Map[String, WebHookContentType] = values.map(enum => enum.code -> enum).toMap
+  private val map: Map[String, WebHookContentType] = values.map(e => e.code -> e).toMap

  def apply(code: String): WebHookContentType = map(code)

--- a/src/main/scala/gitbucket/core/service/AccessTokenService.scala
+++ b/src/main/scala/gitbucket/core/service/AccessTokenService.scala
@@ -21,13 +21,13 @@ trait AccessTokenService {
   * @return (TokenId, Token)
   */
  def generateAccessToken(userName: String, note: String)(implicit s: Session): (Int, String) = {
-    var token: String = null
-    var hash: String = null
+    var token: String = makeAccessTokenString
+    var hash: String = tokenToHash(token)

-    do {
+    while (AccessTokens.filter(_.tokenHash === hash.bind).exists.run) {
      token = makeAccessTokenString
      hash = tokenToHash(token)
-    } while (AccessTokens.filter(_.tokenHash === hash.bind).exists.run)
+    }

    val newToken = AccessToken(userName = userName, note = note, tokenHash = hash)
    val tokenId = (AccessTokens returning AccessTokens.map(_.accessTokenId)) insert newToken
--- a/src/main/scala/gitbucket/core/service/ActivityService.scala
+++ b/src/main/scala/gitbucket/core/service/ActivityService.scala
@@ -1,8 +1,6 @@
 package gitbucket.core.service

 import gitbucket.core.model.Activity
-import gitbucket.core.util.JGitUtil
-import gitbucket.core.model.Profile._
 import gitbucket.core.util.Directory._
 import org.json4s._
 import org.json4s.jackson.Serialization
@@ -11,10 +9,8 @@ import org.json4s.jackson.Serialization.{read, write}
 import scala.util.Using
 import java.io.FileOutputStream
 import java.nio.charset.StandardCharsets
-import java.util.UUID

 import gitbucket.core.controller.Context
-import gitbucket.core.model.activity.BaseActivityInfo
 import org.apache.commons.io.input.ReversedLinesFileReader

 import scala.collection.mutable.ListBuffer
@@ -22,7 +18,7 @@ import scala.collection.mutable.ListBuffer
 trait ActivityService {
  self: RequestCache =>

-  private implicit val formats = Serialization.formats(NoTypeHints)
+  private implicit val formats: Formats = Serialization.formats(NoTypeHints)

  private def writeLog(activity: Activity): Unit = {
    Using.resource(new FileOutputStream(ActivityLog, true)) { out =>
--- a/src/main/scala/gitbucket/core/service/HandleCommentService.scala
+++ b/src/main/scala/gitbucket/core/service/HandleCommentService.scala
@@ -13,7 +13,6 @@ import gitbucket.core.model.activity.{
 }
 import gitbucket.core.plugin.{IssueHook, PluginRegistry}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._

 trait HandleCommentService {
@@ -34,105 +33,104 @@ trait HandleCommentService {
    actionOpt: Option[String]
  )(implicit context: Context, s: Session) = {
    context.loginAccount.flatMap { loginAccount =>
-      defining(repository.owner, repository.name) {
-        case (owner, name) =>
-          val userName = loginAccount.userName
+      val owner = repository.owner
+      val name = repository.name
+      val userName = loginAccount.userName

-          actionOpt.collect {
-            case "close" if !issue.closed =>
-              updateClosed(owner, name, issue.issueId, true)
-            case "reopen" if issue.closed =>
-              updateClosed(owner, name, issue.issueId, false)
-          }
-
-          val (action, _) = actionOpt
-            .collect {
-              case "close" if !issue.closed =>
-                val info = if (issue.isPullRequest) {
-                  ClosePullRequestInfo(owner, name, userName, issue.issueId, issue.title)
-                } else {
-                  CloseIssueInfo(owner, name, userName, issue.issueId, issue.title)
-                }
-                recordActivity(info)
-                Some("close") -> info
-              case "reopen" if issue.closed =>
-                val info = if (issue.isPullRequest) {
-                  ReopenPullRequestInfo(owner, name, userName, issue.issueId, issue.title)
-                } else {
-                  ReopenIssueInfo(owner, name, userName, issue.issueId, issue.title)
-                }
-                recordActivity(info)
-                Some("reopen") -> info
-            }
-            .getOrElse(None -> None)
-
-          val commentId = (content, action) match {
-            case (None, None) => None
-            case (None, Some(action)) =>
-              Some(createComment(owner, name, userName, issue.issueId, action.capitalize, action))
-            case (Some(content), _) =>
-              val id = Some(
-                createComment(
-                  owner,
-                  name,
-                  userName,
-                  issue.issueId,
-                  content,
-                  action.map(_ + "_comment").getOrElse("comment")
-                )
-              )
-
-              // record comment activity
-              val commentInfo = if (issue.isPullRequest) {
-                PullRequestCommentInfo(owner, name, userName, content, issue.issueId)
-              } else {
-                IssueCommentInfo(owner, name, userName, content, issue.issueId)
-              }
-              recordActivity(commentInfo)
-
-              // extract references and create refer comment
-              createReferComment(owner, name, issue, content, loginAccount)
-
-              id
-          }
-
-          // call web hooks
-          action match {
-            case None =>
-              commentId foreach (callIssueCommentWebHook(repository, issue, _, loginAccount, context.settings))
-            case Some(act) =>
-              val webHookAction = act match {
-                case "close"  => "closed"
-                case "reopen" => "reopened"
-              }
-              if (issue.isPullRequest)
-                callPullRequestWebHook(webHookAction, repository, issue.issueId, loginAccount, context.settings)
-              else
-                callIssuesWebHook(webHookAction, repository, issue, loginAccount, context.settings)
-          }
-
-          // call hooks
-          content foreach { x =>
-            if (issue.isPullRequest)
-              PluginRegistry().getPullRequestHooks.foreach(_.addedComment(commentId.get, x, issue, repository))
-            else
-              PluginRegistry().getIssueHooks.foreach(_.addedComment(commentId.get, x, issue, repository))
-          }
-          action foreach {
-            case "close" =>
-              if (issue.isPullRequest)
-                PluginRegistry().getPullRequestHooks.foreach(_.closed(issue, repository))
-              else
-                PluginRegistry().getIssueHooks.foreach(_.closed(issue, repository))
-            case "reopen" =>
-              if (issue.isPullRequest)
-                PluginRegistry().getPullRequestHooks.foreach(_.reopened(issue, repository))
-              else
-                PluginRegistry().getIssueHooks.foreach(_.reopened(issue, repository))
-          }
-
-          commentId.map(issue -> _)
+      actionOpt.collect {
+        case "close" if !issue.closed =>
+          updateClosed(owner, name, issue.issueId, true)
+        case "reopen" if issue.closed =>
+          updateClosed(owner, name, issue.issueId, false)
      }
+
+      val (action, _) = actionOpt
+        .collect {
+          case "close" if !issue.closed =>
+            val info = if (issue.isPullRequest) {
+              ClosePullRequestInfo(owner, name, userName, issue.issueId, issue.title)
+            } else {
+              CloseIssueInfo(owner, name, userName, issue.issueId, issue.title)
+            }
+            recordActivity(info)
+            Some("close") -> info
+          case "reopen" if issue.closed =>
+            val info = if (issue.isPullRequest) {
+              ReopenPullRequestInfo(owner, name, userName, issue.issueId, issue.title)
+            } else {
+              ReopenIssueInfo(owner, name, userName, issue.issueId, issue.title)
+            }
+            recordActivity(info)
+            Some("reopen") -> info
+        }
+        .getOrElse(None -> None)
+
+      val commentId = (content, action) match {
+        case (None, None) => None
+        case (None, Some(action)) =>
+          Some(createComment(owner, name, userName, issue.issueId, action.capitalize, action))
+        case (Some(content), _) =>
+          val id = Some(
+            createComment(
+              owner,
+              name,
+              userName,
+              issue.issueId,
+              content,
+              action.map(_ + "_comment").getOrElse("comment")
+            )
+          )
+
+          // record comment activity
+          val commentInfo = if (issue.isPullRequest) {
+            PullRequestCommentInfo(owner, name, userName, content, issue.issueId)
+          } else {
+            IssueCommentInfo(owner, name, userName, content, issue.issueId)
+          }
+          recordActivity(commentInfo)
+
+          // extract references and create refer comment
+          createReferComment(owner, name, issue, content, loginAccount)
+
+          id
+      }
+
+      // call web hooks
+      action match {
+        case None =>
+          commentId foreach (callIssueCommentWebHook(repository, issue, _, loginAccount, context.settings))
+        case Some(act) =>
+          val webHookAction = act match {
+            case "close"  => "closed"
+            case "reopen" => "reopened"
+          }
+          if (issue.isPullRequest)
+            callPullRequestWebHook(webHookAction, repository, issue.issueId, loginAccount, context.settings)
+          else
+            callIssuesWebHook(webHookAction, repository, issue, loginAccount, context.settings)
+      }
+
+      // call hooks
+      content foreach { x =>
+        if (issue.isPullRequest)
+          PluginRegistry().getPullRequestHooks.foreach(_.addedComment(commentId.get, x, issue, repository))
+        else
+          PluginRegistry().getIssueHooks.foreach(_.addedComment(commentId.get, x, issue, repository))
+      }
+      action foreach {
+        case "close" =>
+          if (issue.isPullRequest)
+            PluginRegistry().getPullRequestHooks.foreach(_.closed(issue, repository))
+          else
+            PluginRegistry().getIssueHooks.foreach(_.closed(issue, repository))
+        case "reopen" =>
+          if (issue.isPullRequest)
+            PluginRegistry().getPullRequestHooks.foreach(_.reopened(issue, repository))
+          else
+            PluginRegistry().getIssueHooks.foreach(_.reopened(issue, repository))
+      }
+
+      commentId.map(issue -> _)
    }
  }

@@ -161,33 +159,32 @@ trait HandleCommentService {
    content: Option[String]
  )(implicit context: Context, s: Session): Option[(Issue, Int)] = {
    context.loginAccount.flatMap { loginAccount =>
-      defining(repository.owner, repository.name) {
-        case (owner, name) =>
-          val userName = loginAccount.userName
-          content match {
-            case Some(content) =>
-              // Update comment
-              val _commentId = Some(updateComment(issue.issueId, commentId.toInt, content))
-              // Record comment activity
-              val commentInfo = if (issue.isPullRequest) {
-                PullRequestCommentInfo(owner, name, userName, content, issue.issueId)
-              } else {
-                IssueCommentInfo(owner, name, userName, content, issue.issueId)
-              }
-              recordActivity(commentInfo)
-              // extract references and create refer comment
-              createReferComment(owner, name, issue, content, loginAccount)
-              // call web hooks
-              commentId foreach (callIssueCommentWebHook(repository, issue, _, loginAccount, context.settings))
-              // call hooks
-              if (issue.isPullRequest)
-                PluginRegistry().getPullRequestHooks
-                  .foreach(_.updatedComment(commentId.toInt, content, issue, repository))
-              else
-                PluginRegistry().getIssueHooks.foreach(_.updatedComment(commentId.toInt, content, issue, repository))
-              _commentId.map(issue -> _)
-            case _ => None
+      val owner = repository.owner
+      val name = repository.name
+      val userName = loginAccount.userName
+      content match {
+        case Some(content) =>
+          // Update comment
+          val _commentId = Some(updateComment(issue.issueId, commentId.toInt, content))
+          // Record comment activity
+          val commentInfo = if (issue.isPullRequest) {
+            PullRequestCommentInfo(owner, name, userName, content, issue.issueId)
+          } else {
+            IssueCommentInfo(owner, name, userName, content, issue.issueId)
          }
+          recordActivity(commentInfo)
+          // extract references and create refer comment
+          createReferComment(owner, name, issue, content, loginAccount)
+          // call web hooks
+          commentId foreach (callIssueCommentWebHook(repository, issue, _, loginAccount, context.settings))
+          // call hooks
+          if (issue.isPullRequest)
+            PluginRegistry().getPullRequestHooks
+              .foreach(_.updatedComment(commentId.toInt, content, issue, repository))
+          else
+            PluginRegistry().getIssueHooks.foreach(_.updatedComment(commentId.toInt, content, issue, repository))
+          _commentId.map(issue -> _)
+        case _ => None
      }
    }
  }
--- a/src/main/scala/gitbucket/core/service/IssuesService.scala
+++ b/src/main/scala/gitbucket/core/service/IssuesService.scala
@@ -5,17 +5,7 @@ import gitbucket.core.util.StringUtil._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.controller.Context
-import gitbucket.core.model.{
-  Account,
-  CommitState,
-  Issue,
-  IssueComment,
-  IssueLabel,
-  Label,
-  PullRequest,
-  Repository,
-  Role
-}
+import gitbucket.core.model.{Account, Issue, IssueComment, IssueLabel, Label, PullRequest, Repository, Role}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
@@ -778,16 +768,37 @@ trait IssuesService {
  def createReferComment(owner: String, repository: String, fromIssue: Issue, message: String, loginAccount: Account)(
    implicit s: Session
  ): Unit = {
-    extractIssueId(message).foreach { issueId =>
-      val content = s"${fromIssue.issueId}:${fromIssue.title}"
-      if (getIssue(owner, repository, issueId).isDefined) {
-        // Not add if refer comment already exist.
-        if (!getComments(owner, repository, issueId.toInt).exists { x =>
-              x.action == "refer" && x.content == content
-            }) {
-          createComment(owner, repository, loginAccount.userName, issueId.toInt, content, "refer")
+    extractGlobalIssueId(message).foreach {
+      case (_referredOwner, _referredRepository, referredIssueId) =>
+        val referredOwner = _referredOwner.getOrElse(owner)
+        val referredRepository = _referredRepository.getOrElse(repository)
+        getRepository(referredOwner, referredRepository).foreach { repo =>
+          if (isReadable(repo.repository, Option(loginAccount))) {
+            getIssue(referredOwner, referredRepository, referredIssueId.get).foreach { _ =>
+              val (content, action) = if (owner == referredOwner && repository == referredRepository) {
+                (s"${fromIssue.issueId}:${fromIssue.title}", "refer")
+              } else {
+                (s"${fromIssue.issueId}:${owner}:${repository}:${fromIssue.title}", "refer_global")
+              }
+              referredIssueId.foreach(
+                x =>
+                  // Not add if refer comment already exist.
+                  if (!getComments(referredOwner, referredRepository, x.toInt).exists { x =>
+                        (x.action == "refer" || x.action == "refer_global") && x.content == content
+                      }) {
+                    createComment(
+                      referredOwner,
+                      referredRepository,
+                      loginAccount.userName,
+                      x.toInt,
+                      content,
+                      action
+                    )
+                }
+              )
+            }
+          }
        }
-      }
    }
  }

--- a/src/main/scala/gitbucket/core/service/MergeService.scala
+++ b/src/main/scala/gitbucket/core/service/MergeService.scala
@@ -72,7 +72,7 @@ trait MergeService {
  )(implicit s: Session, c: JsonFormat.Context): ObjectId = {
    val beforeCommitId = git.getRepository.resolve(s"refs/heads/${branch}")
    val afterCommitId = new MergeCacheInfo(git, repository.owner, repository.name, branch, issueId, getReceiveHooks())
-      .merge(message, new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
+      .merge(message, new PersonIdent(loginAccount.fullName, loginAccount.mailAddress), loginAccount.userName)
    callWebHook(git, repository, branch, beforeCommitId, afterCommitId, loginAccount, settings)
    afterCommitId
  }
@@ -90,7 +90,7 @@ trait MergeService {
    val beforeCommitId = git.getRepository.resolve(s"refs/heads/${branch}")
    val afterCommitId =
      new MergeCacheInfo(git, repository.owner, repository.name, branch, issueId, getReceiveHooks())
-        .rebase(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress), commits)
+        .rebase(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress), loginAccount.userName, commits)
    callWebHook(git, repository, branch, beforeCommitId, afterCommitId, loginAccount, settings)
    afterCommitId
  }
@@ -108,7 +108,7 @@ trait MergeService {
    val beforeCommitId = git.getRepository.resolve(s"refs/heads/${branch}")
    val afterCommitId =
      new MergeCacheInfo(git, repository.owner, repository.name, branch, issueId, getReceiveHooks())
-        .squash(message, new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
+        .squash(message, new PersonIdent(loginAccount.fullName, loginAccount.mailAddress), loginAccount.userName)
    callWebHook(git, repository, branch, beforeCommitId, afterCommitId, loginAccount, settings)
    afterCommitId
  }
@@ -648,7 +648,7 @@ object MergeService {
    }

    // update branch from cache
-    def merge(message: String, committer: PersonIdent)(implicit s: Session): ObjectId = {
+    def merge(message: String, committer: PersonIdent, pusher: String)(implicit s: Session): ObjectId = {
      if (checkConflict().isDefined) {
        throw new RuntimeException("This pull request can't merge automatically.")
      }
@@ -665,7 +665,7 @@ object MergeService {

      // call pre-commit hooks
      val error = receiveHooks.flatMap { hook =>
-        hook.preReceive(userName, repositoryName, receivePack, receiveCommand, committer.getName, true)
+        hook.preReceive(userName, repositoryName, receivePack, receiveCommand, pusher, true)
      }.headOption

      error.foreach { error =>
@@ -683,7 +683,7 @@ object MergeService {
      objectId
    }

-    def rebase(committer: PersonIdent, commits: Seq[RevCommit])(implicit s: Session): ObjectId = {
+    def rebase(committer: PersonIdent, pusher: String, commits: Seq[RevCommit])(implicit s: Session): ObjectId = {
      if (checkConflict().isDefined) {
        throw new RuntimeException("This pull request can't merge automatically.")
      }
@@ -719,7 +719,7 @@ object MergeService {

      // call pre-commit hooks
      val error = receiveHooks.flatMap { hook =>
-        hook.preReceive(userName, repositoryName, receivePack, receiveCommand, committer.getName, true)
+        hook.preReceive(userName, repositoryName, receivePack, receiveCommand, pusher, true)
      }.headOption

      error.foreach { error =>
@@ -738,7 +738,7 @@ object MergeService {
      objectId
    }

-    def squash(message: String, committer: PersonIdent)(implicit s: Session): ObjectId = {
+    def squash(message: String, committer: PersonIdent, pusher: String)(implicit s: Session): ObjectId = {
      if (checkConflict().isDefined) {
        throw new RuntimeException("This pull request can't merge automatically.")
      }
@@ -769,7 +769,7 @@ object MergeService {

      // call pre-commit hooks
      val error = receiveHooks.flatMap { hook =>
-        hook.preReceive(userName, repositoryName, receivePack, receiveCommand, committer.getName, true)
+        hook.preReceive(userName, repositoryName, receivePack, receiveCommand, pusher, true)
      }.headOption

      error.foreach { error =>
--- a/src/main/scala/gitbucket/core/service/OpenIDConnectService.scala
+++ b/src/main/scala/gitbucket/core/service/OpenIDConnectService.scala
@@ -101,7 +101,10 @@ trait OpenIDConnectService {
    redirectURI: URI
  ): Option[AuthenticationSuccessResponse] =
    try {
-      AuthenticationResponseParser.parse(redirectURI, params.asJava) match {
+      AuthenticationResponseParser.parse(
+        redirectURI,
+        params.map { case (key, value) => (key, List(value).asJava) }.asJava
+      ) match {
        case response: AuthenticationSuccessResponse =>
          if (response.getState == state) {
            Some(response)
--- a/src/main/scala/gitbucket/core/service/PrioritiesService.scala
+++ b/src/main/scala/gitbucket/core/service/PrioritiesService.scala
@@ -3,7 +3,6 @@ package gitbucket.core.service
 import gitbucket.core.model.Priority
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
-import gitbucket.core.util.StringUtil

 trait PrioritiesService {

--- a/src/main/scala/gitbucket/core/service/PullRequestService.scala
+++ b/src/main/scala/gitbucket/core/service/PullRequestService.scala
@@ -1,9 +1,10 @@
 package gitbucket.core.service

+import com.github.difflib.DiffUtils
+import com.github.difflib.patch.DeltaType
 import gitbucket.core.model.{CommitComments => _, Session => _, _}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
-import difflib.{Delta, DiffUtils}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.api.JsonFormat
 import gitbucket.core.controller.Context
@@ -243,7 +244,7 @@ trait PullRequestService {
    owner: String,
    repository: String,
    branch: String,
-    loginAccount: Account,
+    pusherAccount: Account,
    action: String,
    settings: SystemSettings
  )(
@@ -295,7 +296,7 @@ trait PullRequestService {
          action,
          getRepository(owner, repository).get,
          pullreq.requestBranch,
-          loginAccount,
+          pusherAccount,
          settings
        )
      }
@@ -441,16 +442,17 @@ trait PullRequestService {
                  case Left(oldLine) => updateCommitCommentPosition(commentId, newCommitId, Some(oldLine), None)
                  case Right(newLine) =>
                    var counter = newLine
-                    patch.getDeltas.asScala.filter(_.getOriginal.getPosition < newLine).foreach { delta =>
+                    patch.getDeltas.asScala.filter(_.getSource.getPosition < newLine).foreach { delta =>
                      delta.getType match {
-                        case Delta.TYPE.CHANGE =>
-                          if (delta.getOriginal.getPosition <= newLine - 1 && newLine <= delta.getOriginal.getPosition + delta.getRevised.getLines.size) {
+                        case DeltaType.CHANGE =>
+                          if (delta.getSource.getPosition <= newLine - 1 && newLine <= delta.getSource.getPosition + delta.getTarget.getLines.size) {
                            counter = -1
                          } else {
-                            counter = counter + (delta.getRevised.getLines.size - delta.getOriginal.getLines.size)
+                            counter = counter + (delta.getTarget.getLines.size - delta.getSource.getLines.size)
                          }
-                        case Delta.TYPE.INSERT => counter = counter + delta.getRevised.getLines.size
-                        case Delta.TYPE.DELETE => counter = counter - delta.getOriginal.getLines.size
+                        case DeltaType.INSERT => counter = counter + delta.getTarget.getLines.size
+                        case DeltaType.DELETE => counter = counter - delta.getSource.getLines.size
+                        case DeltaType.EQUAL  => // Do nothing
                      }
                    }
                    if (counter >= 0) {
--- a/src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryCommitFileService.scala
@@ -23,23 +23,29 @@ trait RepositoryCommitFileService {
    with PullRequestService
    with WebHookPullRequestService
    with RepositoryService =>
-  import RepositoryCommitFileService._

+  /**
+   * Create multiple files by callback function.
+   * Returns commitId.
+   */
  def commitFiles(
    repository: RepositoryService.RepositoryInfo,
-    files: Seq[CommitFile],
    branch: String,
-    path: String,
    message: String,
    loginAccount: Account,
    settings: SystemSettings
  )(
    f: (Git, ObjectId, DirCacheBuilder, ObjectInserter) => Unit
-  )(implicit s: Session, c: JsonFormat.Context) = {
-    // prepend path to the filename
-    _commitFile(repository, branch, message, loginAccount, loginAccount.fullName, loginAccount.mailAddress, settings)(f)
+  )(implicit s: Session, c: JsonFormat.Context): ObjectId = {
+    _createFiles(repository, branch, message, loginAccount, loginAccount.fullName, loginAccount.mailAddress, settings)(
+      f
+    )._1
  }

+  /**
+   * Create a file from string content.
+   * Returns commitId + blobId.
+   */
  def commitFile(
    repository: RepositoryService.RepositoryInfo,
    branch: String,
@@ -52,7 +58,7 @@ trait RepositoryCommitFileService {
    commit: String,
    loginAccount: Account,
    settings: SystemSettings
-  )(implicit s: Session, c: JsonFormat.Context): ObjectId = {
+  )(implicit s: Session, c: JsonFormat.Context): (ObjectId, Option[ObjectId]) = {
    commitFile(
      repository,
      branch,
@@ -69,6 +75,10 @@ trait RepositoryCommitFileService {
    )
  }

+  /**
+   * Create a file from byte array content.
+   * Returns commitId + blobId.
+   */
  def commitFile(
    repository: RepositoryService.RepositoryInfo,
    branch: String,
@@ -78,11 +88,11 @@ trait RepositoryCommitFileService {
    content: Array[Byte],
    message: String,
    commit: String,
-    loginAccount: Account,
-    fullName: String,
-    mailAddress: String,
+    pusherAccount: Account,
+    committerName: String,
+    committerMailAddress: String,
    settings: SystemSettings
-  )(implicit s: Session, c: JsonFormat.Context): ObjectId = {
+  )(implicit s: Session, c: JsonFormat.Context): (ObjectId, Option[ObjectId]) = {

    val newPath = newFileName.map { newFileName =>
      if (path.length == 0) newFileName else s"${path}/${newFileName}"
@@ -91,7 +101,7 @@ trait RepositoryCommitFileService {
      if (path.length == 0) oldFileName else s"${path}/${oldFileName}"
    }

-    _commitFile(repository, branch, message, loginAccount, fullName, mailAddress, settings) {
+    _createFiles(repository, branch, message, pusherAccount, committerName, committerMailAddress, settings) {
      case (git, headTip, builder, inserter) =>
        if (headTip.getName == commit) {
          val permission = JGitUtil
@@ -105,28 +115,33 @@ trait RepositoryCommitFileService {
            }
            .flatten
            .headOption
-
-          newPath.foreach { newPath =>
-            builder.add(JGitUtil.createDirCacheEntry(newPath, permission.map { bits =>
+            .map { bits =>
              FileMode.fromBits(bits)
-            } getOrElse FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, content)))
+            }
+            .getOrElse(FileMode.REGULAR_FILE)
+
+          val objectId = newPath.map { newPath =>
+            val objectId = inserter.insert(Constants.OBJ_BLOB, content)
+            builder.add(JGitUtil.createDirCacheEntry(newPath, permission, objectId))
+            objectId
          }
          builder.finish()
-        }
+          objectId
+        } else None
    }
  }

-  private def _commitFile(
+  private def _createFiles[R](
    repository: RepositoryService.RepositoryInfo,
    branch: String,
    message: String,
-    loginAccount: Account,
+    pusherAccount: Account,
    committerName: String,
    committerMailAddress: String,
    settings: SystemSettings
  )(
-    f: (Git, ObjectId, DirCacheBuilder, ObjectInserter) => Unit
-  )(implicit s: Session, c: JsonFormat.Context): ObjectId = {
+    f: (Git, ObjectId, DirCacheBuilder, ObjectInserter) => R
+  )(implicit s: Session, c: JsonFormat.Context): (ObjectId, R) = {

    LockUtil.lock(s"${repository.owner}/${repository.name}") {
      Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
@@ -135,7 +150,7 @@ trait RepositoryCommitFileService {
        val headName = s"refs/heads/${branch}"
        val headTip = git.getRepository.resolve(headName)

-        f(git, headTip, builder, inserter)
+        val result = f(git, headTip, builder, inserter)

        val commitId = JGitUtil.createNewCommit(
          git,
@@ -156,7 +171,7 @@ trait RepositoryCommitFileService {

        // call pre-commit hook
        val error = PluginRegistry().getReceiveHooks.flatMap { hook =>
-          hook.preReceive(repository.owner, repository.name, receivePack, receiveCommand, committerName, false)
+          hook.preReceive(repository.owner, repository.name, receivePack, receiveCommand, pusherAccount.userName, false)
        }.headOption

        error match {
@@ -177,12 +192,12 @@ trait RepositoryCommitFileService {
            refUpdate.update()

            // update pull request
-            updatePullRequests(repository.owner, repository.name, branch, loginAccount, "synchronize", settings)
+            updatePullRequests(repository.owner, repository.name, branch, pusherAccount, "synchronize", settings)

            // record activity
            updateLastActivityDate(repository.owner, repository.name)
            val commitInfo = new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
-            val pushInfo = PushInfo(repository.owner, repository.name, loginAccount.userName, branch, List(commitInfo))
+            val pushInfo = PushInfo(repository.owner, repository.name, pusherAccount.userName, branch, List(commitInfo))
            recordActivity(pushInfo)

            // create issue comment by commit message
@@ -192,17 +207,17 @@ trait RepositoryCommitFileService {
            if (branch == repository.repository.defaultBranch) {
              closeIssuesFromMessage(message, committerName, repository.owner, repository.name).foreach { issueId =>
                getIssue(repository.owner, repository.name, issueId.toString).foreach { issue =>
-                  callIssuesWebHook("closed", repository, issue, loginAccount, settings)
+                  callIssuesWebHook("closed", repository, issue, pusherAccount, settings)
                  val closeIssueInfo = CloseIssueInfo(
                    repository.owner,
                    repository.name,
-                    loginAccount.userName,
+                    pusherAccount.userName,
                    issue.issueId,
                    issue.title
                  )
                  recordActivity(closeIssueInfo)
                  PluginRegistry().getIssueHooks
-                    .foreach(_.closedByCommitComment(issue, repository, message, loginAccount))
+                    .foreach(_.closedByCommitComment(issue, repository, message, pusherAccount))
                }
              }
            }
@@ -217,7 +232,7 @@ trait RepositoryCommitFileService {
              getAccountByUserName(repository.owner).map { ownerAccount =>
                WebHookPushPayload(
                  git,
-                  loginAccount,
+                  pusherAccount,
                  headName,
                  repository,
                  List(commit),
@@ -228,7 +243,7 @@ trait RepositoryCommitFileService {
              }
            }
        }
-        commitId
+        (commitId, result)
      }
    }
  }
--- a/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryCreationService.scala
@@ -53,6 +53,11 @@ trait RepositoryCreationService {
    with ActivityService
    with PrioritiesService =>

+  def canCreateRepository(repositoryOwner: String, loginAccount: Account)(implicit session: Session): Boolean = {
+    repositoryOwner == loginAccount.userName || getGroupsByUserName(loginAccount.userName)
+      .contains(repositoryOwner) || loginAccount.isAdmin
+  }
+
  def createRepository(
    loginAccount: Account,
    owner: String,
@@ -76,7 +81,7 @@ trait RepositoryCreationService {
    RepositoryCreationService.startCreation(owner, name)
    try {
      Database() withTransaction { implicit session =>
-        val ownerAccount = getAccountByUserName(owner).get
+        //val ownerAccount = getAccountByUserName(owner).get
        val loginUserName = loginAccount.userName

        val copyRepositoryDir = if (initOption == "COPY") {
--- a/src/main/scala/gitbucket/core/service/RepositoryService.scala
+++ b/src/main/scala/gitbucket/core/service/RepositoryService.scala
@@ -2,7 +2,6 @@ package gitbucket.core.service

 import gitbucket.core.controller.Context
 import gitbucket.core.util._
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.model.{CommitComments => _, Session => _, _}
 import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
@@ -12,7 +11,7 @@ import gitbucket.core.util.Directory.{getRepositoryDir, getRepositoryFilesDir, g
 import gitbucket.core.util.JGitUtil.FileInfo
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.api.Git
-import org.eclipse.jgit.lib.{Repository => _, _}
+import org.eclipse.jgit.lib.{Repository => _}
 import scala.util.Using

 trait RepositoryService {
@@ -61,7 +60,8 @@ trait RepositoryService {
          externalWikiUrl = None,
          allowFork = true,
          mergeOptions = "merge-commit,squash,rebase",
-          defaultMergeOption = "merge-commit"
+          defaultMergeOption = "merge-commit",
+          safeMode = true
        )
      )

@@ -202,22 +202,19 @@ trait RepositoryService {
          )

          // Move git repository
-          defining(getRepositoryDir(oldUserName, oldRepositoryName)) { dir =>
-            if (dir.isDirectory) {
-              FileUtils.moveDirectory(dir, getRepositoryDir(newUserName, newRepositoryName))
-            }
+          val repoDir = getRepositoryDir(oldUserName, oldRepositoryName)
+          if (repoDir.isDirectory) {
+            FileUtils.moveDirectory(repoDir, getRepositoryDir(newUserName, newRepositoryName))
          }
          // Move wiki repository
-          defining(getWikiRepositoryDir(oldUserName, oldRepositoryName)) { dir =>
-            if (dir.isDirectory) {
-              FileUtils.moveDirectory(dir, getWikiRepositoryDir(newUserName, newRepositoryName))
-            }
+          val wikiDir = getWikiRepositoryDir(oldUserName, oldRepositoryName)
+          if (wikiDir.isDirectory) {
+            FileUtils.moveDirectory(wikiDir, getWikiRepositoryDir(newUserName, newRepositoryName))
          }
          // Move files directory
-          defining(getRepositoryFilesDir(oldUserName, oldRepositoryName)) { dir =>
-            if (dir.isDirectory) {
-              FileUtils.moveDirectory(dir, getRepositoryFilesDir(newUserName, newRepositoryName))
-            }
+          val filesDir = getRepositoryFilesDir(oldUserName, oldRepositoryName)
+          if (filesDir.isDirectory) {
+            FileUtils.moveDirectory(filesDir, getRepositoryFilesDir(newUserName, newRepositoryName))
          }
          // Delete parent directory
          FileUtil.deleteDirectoryIfEmpty(getRepositoryFilesDir(oldUserName, oldRepositoryName))
@@ -237,10 +234,11 @@ trait RepositoryService {
    LockUtil.lock(s"${repository.userName}/${repository.repositoryName}") {
      deleteRepositoryOnModel(repository.userName, repository.repositoryName)

-      FileUtils.deleteDirectory(getRepositoryDir(repository.userName, repository.repositoryName))
-      FileUtils.deleteDirectory(getWikiRepositoryDir(repository.userName, repository.repositoryName))
-      FileUtils.deleteDirectory(getTemporaryDir(repository.userName, repository.repositoryName))
-      FileUtils.deleteDirectory(getRepositoryFilesDir(repository.userName, repository.repositoryName))
+      FileUtil.deleteRecursively(getRepositoryDir(repository.userName, repository.repositoryName))
+
+      FileUtil.deleteRecursively(getWikiRepositoryDir(repository.userName, repository.repositoryName))
+      FileUtil.deleteRecursively(getTemporaryDir(repository.userName, repository.repositoryName))
+      FileUtil.deleteRecursively(getRepositoryFilesDir(repository.userName, repository.repositoryName))

      // Call hooks
      PluginRegistry().getRepositoryHooks.foreach(_.deleted(repository.userName, repository.repositoryName))
@@ -463,7 +461,7 @@ trait RepositoryService {
          .filter { case (t1, t2) => t2.removed === false.bind }
          .map { case (t1, t2) => t1 }
      // for Normal Users
-      case Some(x) if (!x.isAdmin || limit) =>
+      case Some(x) =>
        Repositories
          .join(Accounts)
          .on(_.userName === _.userName)
@@ -553,7 +551,8 @@ trait RepositoryService {
    externalWikiUrl: Option[String],
    allowFork: Boolean,
    mergeOptions: Seq[String],
-    defaultMergeOption: String
+    defaultMergeOption: String,
+    safeMode: Boolean
  )(implicit s: Session): Unit = {

    Repositories
@@ -569,6 +568,7 @@ trait RepositoryService {
          r.allowFork,
          r.mergeOptions,
          r.defaultMergeOption,
+          r.safeMode,
          r.updatedDate
        )
      }
@@ -582,6 +582,7 @@ trait RepositoryService {
        allowFork,
        mergeOptions.mkString(","),
        defaultMergeOption,
+        safeMode,
        currentDate
      )
  }
@@ -819,11 +820,13 @@ object RepositoryService {
    def sshUrl(implicit context: Context): Option[String] = RepositoryService.sshUrl(owner, name)

    def splitPath(path: String): (String, String) = {
-      val id = branchList.collectFirst {
-        case branch if (path == branch || path.startsWith(branch + "/")) => branch
-      } orElse tags.collectFirst {
-        case tag if (path == tag.name || path.startsWith(tag.name + "/")) => tag.name
-      } getOrElse path.split("/")(0)
+      val names = (branchList ++ tags.map(_.name)).sortBy(_.length).reverse
+
+      val id = names.collectFirst {
+        case name if (path == name || path.startsWith(name + "/")) => name
+      } getOrElse {
+        path.split("/")(0)
+      }

      (id, path.substring(id.length).stripPrefix("/"))
    }
--- a/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
+++ b/src/main/scala/gitbucket/core/service/SystemSettingsService.scala
@@ -7,7 +7,6 @@ import com.nimbusds.oauth2.sdk.id.{ClientID, Issuer}
 import gitbucket.core.service.SystemSettingsService._
 import gitbucket.core.util.ConfigUtil._
 import gitbucket.core.util.Directory._
-import gitbucket.core.util.SyntaxSugars._
 import scala.util.Using

 trait SystemSettingsService {
@@ -15,175 +14,173 @@ trait SystemSettingsService {
  def baseUrl(implicit request: HttpServletRequest): String = loadSystemSettings().baseUrl(request)

  def saveSystemSettings(settings: SystemSettings): Unit = {
-    defining(new java.util.Properties()) { props =>
-      settings.baseUrl.foreach(x => props.setProperty(BaseURL, x.replaceFirst("/\\Z", "")))
-      settings.information.foreach(x => props.setProperty(Information, x))
-      props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
-      props.setProperty(AllowAnonymousAccess, settings.allowAnonymousAccess.toString)
-      props.setProperty(IsCreateRepoOptionPublic, settings.isCreateRepoOptionPublic.toString)
-      props.setProperty(RepositoryOperationCreate, settings.repositoryOperation.create.toString)
-      props.setProperty(RepositoryOperationDelete, settings.repositoryOperation.delete.toString)
-      props.setProperty(RepositoryOperationRename, settings.repositoryOperation.rename.toString)
-      props.setProperty(RepositoryOperationTransfer, settings.repositoryOperation.transfer.toString)
-      props.setProperty(RepositoryOperationFork, settings.repositoryOperation.fork.toString)
-      props.setProperty(Gravatar, settings.gravatar.toString)
-      props.setProperty(Notification, settings.notification.toString)
-      props.setProperty(LimitVisibleRepositories, settings.limitVisibleRepositories.toString)
-      props.setProperty(SshEnabled, settings.ssh.enabled.toString)
-      settings.ssh.sshHost.foreach(x => props.setProperty(SshHost, x.trim))
-      settings.ssh.sshPort.foreach(x => props.setProperty(SshPort, x.toString))
-      props.setProperty(UseSMTP, settings.useSMTP.toString)
-      if (settings.useSMTP) {
-        settings.smtp.foreach { smtp =>
-          props.setProperty(SmtpHost, smtp.host)
-          smtp.port.foreach(x => props.setProperty(SmtpPort, x.toString))
-          smtp.user.foreach(props.setProperty(SmtpUser, _))
-          smtp.password.foreach(props.setProperty(SmtpPassword, _))
-          smtp.ssl.foreach(x => props.setProperty(SmtpSsl, x.toString))
-          smtp.starttls.foreach(x => props.setProperty(SmtpStarttls, x.toString))
-          smtp.fromAddress.foreach(props.setProperty(SmtpFromAddress, _))
-          smtp.fromName.foreach(props.setProperty(SmtpFromName, _))
+    val props = new java.util.Properties()
+    settings.baseUrl.foreach(x => props.setProperty(BaseURL, x.replaceFirst("/\\Z", "")))
+    settings.information.foreach(x => props.setProperty(Information, x))
+    props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
+    props.setProperty(AllowAnonymousAccess, settings.allowAnonymousAccess.toString)
+    props.setProperty(IsCreateRepoOptionPublic, settings.isCreateRepoOptionPublic.toString)
+    props.setProperty(RepositoryOperationCreate, settings.repositoryOperation.create.toString)
+    props.setProperty(RepositoryOperationDelete, settings.repositoryOperation.delete.toString)
+    props.setProperty(RepositoryOperationRename, settings.repositoryOperation.rename.toString)
+    props.setProperty(RepositoryOperationTransfer, settings.repositoryOperation.transfer.toString)
+    props.setProperty(RepositoryOperationFork, settings.repositoryOperation.fork.toString)
+    props.setProperty(Gravatar, settings.gravatar.toString)
+    props.setProperty(Notification, settings.notification.toString)
+    props.setProperty(LimitVisibleRepositories, settings.limitVisibleRepositories.toString)
+    props.setProperty(SshEnabled, settings.ssh.enabled.toString)
+    settings.ssh.sshHost.foreach(x => props.setProperty(SshHost, x.trim))
+    settings.ssh.sshPort.foreach(x => props.setProperty(SshPort, x.toString))
+    props.setProperty(UseSMTP, settings.useSMTP.toString)
+    if (settings.useSMTP) {
+      settings.smtp.foreach { smtp =>
+        props.setProperty(SmtpHost, smtp.host)
+        smtp.port.foreach(x => props.setProperty(SmtpPort, x.toString))
+        smtp.user.foreach(props.setProperty(SmtpUser, _))
+        smtp.password.foreach(props.setProperty(SmtpPassword, _))
+        smtp.ssl.foreach(x => props.setProperty(SmtpSsl, x.toString))
+        smtp.starttls.foreach(x => props.setProperty(SmtpStarttls, x.toString))
+        smtp.fromAddress.foreach(props.setProperty(SmtpFromAddress, _))
+        smtp.fromName.foreach(props.setProperty(SmtpFromName, _))
+      }
+    }
+    props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString)
+    if (settings.ldapAuthentication) {
+      settings.ldap.foreach { ldap =>
+        props.setProperty(LdapHost, ldap.host)
+        ldap.port.foreach(x => props.setProperty(LdapPort, x.toString))
+        ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x))
+        ldap.bindPassword.foreach(x => props.setProperty(LdapBindPassword, x))
+        props.setProperty(LdapBaseDN, ldap.baseDN)
+        props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
+        ldap.additionalFilterCondition.foreach(x => props.setProperty(LdapAdditionalFilterCondition, x))
+        ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x))
+        ldap.mailAttribute.foreach(x => props.setProperty(LdapMailAddressAttribute, x))
+        ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString))
+        ldap.ssl.foreach(x => props.setProperty(LdapSsl, x.toString))
+        ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
+      }
+    }
+    props.setProperty(OidcAuthentication, settings.oidcAuthentication.toString)
+    if (settings.oidcAuthentication) {
+      settings.oidc.foreach { oidc =>
+        props.setProperty(OidcIssuer, oidc.issuer.getValue)
+        props.setProperty(OidcClientId, oidc.clientID.getValue)
+        props.setProperty(OidcClientSecret, oidc.clientSecret.getValue)
+        oidc.jwsAlgorithm.foreach { x =>
+          props.setProperty(OidcJwsAlgorithm, x.getName)
        }
      }
-      props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString)
-      if (settings.ldapAuthentication) {
-        settings.ldap.foreach { ldap =>
-          props.setProperty(LdapHost, ldap.host)
-          ldap.port.foreach(x => props.setProperty(LdapPort, x.toString))
-          ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x))
-          ldap.bindPassword.foreach(x => props.setProperty(LdapBindPassword, x))
-          props.setProperty(LdapBaseDN, ldap.baseDN)
-          props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
-          ldap.additionalFilterCondition.foreach(x => props.setProperty(LdapAdditionalFilterCondition, x))
-          ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x))
-          ldap.mailAttribute.foreach(x => props.setProperty(LdapMailAddressAttribute, x))
-          ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString))
-          ldap.ssl.foreach(x => props.setProperty(LdapSsl, x.toString))
-          ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
-        }
-      }
-      props.setProperty(OidcAuthentication, settings.oidcAuthentication.toString)
-      if (settings.oidcAuthentication) {
-        settings.oidc.foreach { oidc =>
-          props.setProperty(OidcIssuer, oidc.issuer.getValue)
-          props.setProperty(OidcClientId, oidc.clientID.getValue)
-          props.setProperty(OidcClientSecret, oidc.clientSecret.getValue)
-          oidc.jwsAlgorithm.foreach { x =>
-            props.setProperty(OidcJwsAlgorithm, x.getName)
-          }
-        }
-      }
-      props.setProperty(SkinName, settings.skinName.toString)
-      settings.userDefinedCss.foreach(x => props.setProperty(UserDefinedCss, x))
-      props.setProperty(ShowMailAddress, settings.showMailAddress.toString)
-      props.setProperty(WebHookBlockPrivateAddress, settings.webHook.blockPrivateAddress.toString)
-      props.setProperty(WebHookWhitelist, settings.webHook.whitelist.mkString("\n"))
-      props.setProperty(UploadMaxFileSize, settings.upload.maxFileSize.toString)
-      props.setProperty(UploadTimeout, settings.upload.timeout.toString)
-      props.setProperty(UploadLargeMaxFileSize, settings.upload.largeMaxFileSize.toString)
-      props.setProperty(UploadLargeTimeout, settings.upload.largeTimeout.toString)
-      props.setProperty(RepositoryViewerMaxFiles, settings.repositoryViewer.maxFiles.toString)
+    }
+    props.setProperty(SkinName, settings.skinName.toString)
+    settings.userDefinedCss.foreach(x => props.setProperty(UserDefinedCss, x))
+    props.setProperty(ShowMailAddress, settings.showMailAddress.toString)
+    props.setProperty(WebHookBlockPrivateAddress, settings.webHook.blockPrivateAddress.toString)
+    props.setProperty(WebHookWhitelist, settings.webHook.whitelist.mkString("\n"))
+    props.setProperty(UploadMaxFileSize, settings.upload.maxFileSize.toString)
+    props.setProperty(UploadTimeout, settings.upload.timeout.toString)
+    props.setProperty(UploadLargeMaxFileSize, settings.upload.largeMaxFileSize.toString)
+    props.setProperty(UploadLargeTimeout, settings.upload.largeTimeout.toString)
+    props.setProperty(RepositoryViewerMaxFiles, settings.repositoryViewer.maxFiles.toString)

-      Using.resource(new java.io.FileOutputStream(GitBucketConf)) { out =>
-        props.store(out, null)
-      }
+    Using.resource(new java.io.FileOutputStream(GitBucketConf)) { out =>
+      props.store(out, null)
    }
  }

  def loadSystemSettings(): SystemSettings = {
-    defining(new java.util.Properties()) { props =>
-      if (GitBucketConf.exists) {
-        Using.resource(new java.io.FileInputStream(GitBucketConf)) { in =>
-          props.load(in)
-        }
+    val props = new java.util.Properties()
+    if (GitBucketConf.exists) {
+      Using.resource(new java.io.FileInputStream(GitBucketConf)) { in =>
+        props.load(in)
      }
-      SystemSettings(
-        getOptionValue[String](props, BaseURL, None).map(x => x.replaceFirst("/\\Z", "")),
-        getOptionValue(props, Information, None),
-        getValue(props, AllowAccountRegistration, false),
-        getValue(props, AllowAnonymousAccess, true),
-        getValue(props, IsCreateRepoOptionPublic, true),
-        RepositoryOperation(
-          create = getValue(props, RepositoryOperationCreate, true),
-          delete = getValue(props, RepositoryOperationDelete, true),
-          rename = getValue(props, RepositoryOperationRename, true),
-          transfer = getValue(props, RepositoryOperationTransfer, true),
-          fork = getValue(props, RepositoryOperationFork, true)
-        ),
-        getValue(props, Gravatar, false),
-        getValue(props, Notification, false),
-        getValue(props, LimitVisibleRepositories, false),
-        Ssh(
-          getValue(props, SshEnabled, 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))) {
-          Some(
-            Smtp(
-              getValue(props, SmtpHost, ""),
-              getOptionValue(props, SmtpPort, Some(DefaultSmtpPort)),
-              getOptionValue(props, SmtpUser, None),
-              getOptionValue(props, SmtpPassword, None),
-              getOptionValue[Boolean](props, SmtpSsl, None),
-              getOptionValue[Boolean](props, SmtpStarttls, None),
-              getOptionValue(props, SmtpFromAddress, None),
-              getOptionValue(props, SmtpFromName, None)
-            )
-          )
-        } else None,
-        getValue(props, LdapAuthentication, false),
-        if (getValue(props, LdapAuthentication, false)) {
-          Some(
-            Ldap(
-              getValue(props, LdapHost, ""),
-              getOptionValue(props, LdapPort, Some(DefaultLdapPort)),
-              getOptionValue(props, LdapBindDN, None),
-              getOptionValue(props, LdapBindPassword, None),
-              getValue(props, LdapBaseDN, ""),
-              getValue(props, LdapUserNameAttribute, ""),
-              getOptionValue(props, LdapAdditionalFilterCondition, None),
-              getOptionValue(props, LdapFullNameAttribute, None),
-              getOptionValue(props, LdapMailAddressAttribute, None),
-              getOptionValue[Boolean](props, LdapTls, None),
-              getOptionValue[Boolean](props, LdapSsl, None),
-              getOptionValue(props, LdapKeystore, None)
-            )
-          )
-        } else None,
-        getValue(props, OidcAuthentication, false),
-        if (getValue(props, OidcAuthentication, false)) {
-          Some(
-            OIDC(
-              getValue(props, OidcIssuer, ""),
-              getValue(props, OidcClientId, ""),
-              getValue(props, OidcClientSecret, ""),
-              getOptionValue(props, OidcJwsAlgorithm, None)
-            )
-          )
-        } else {
-          None
-        },
-        getValue(props, SkinName, "skin-blue"),
-        getOptionValue(props, UserDefinedCss, None),
-        getValue(props, ShowMailAddress, false),
-        WebHook(getValue(props, WebHookBlockPrivateAddress, false), getSeqValue(props, WebHookWhitelist, "")),
-        Upload(
-          getValue(props, UploadMaxFileSize, 3 * 1024 * 1024),
-          getValue(props, UploadTimeout, 3 * 10000),
-          getValue(props, UploadLargeMaxFileSize, 3 * 1024 * 1024),
-          getValue(props, UploadLargeTimeout, 3 * 10000)
-        ),
-        RepositoryViewerSettings(
-          getValue(props, RepositoryViewerMaxFiles, 0)
-        )
-      )
    }
+    SystemSettings(
+      getOptionValue[String](props, BaseURL, None).map(x => x.replaceFirst("/\\Z", "")),
+      getOptionValue(props, Information, None),
+      getValue(props, AllowAccountRegistration, false),
+      getValue(props, AllowAnonymousAccess, true),
+      getValue(props, IsCreateRepoOptionPublic, true),
+      RepositoryOperation(
+        create = getValue(props, RepositoryOperationCreate, true),
+        delete = getValue(props, RepositoryOperationDelete, true),
+        rename = getValue(props, RepositoryOperationRename, true),
+        transfer = getValue(props, RepositoryOperationTransfer, true),
+        fork = getValue(props, RepositoryOperationFork, true)
+      ),
+      getValue(props, Gravatar, false),
+      getValue(props, Notification, false),
+      getValue(props, LimitVisibleRepositories, false),
+      Ssh(
+        getValue(props, SshEnabled, 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))) {
+        Some(
+          Smtp(
+            getValue(props, SmtpHost, ""),
+            getOptionValue(props, SmtpPort, Some(DefaultSmtpPort)),
+            getOptionValue(props, SmtpUser, None),
+            getOptionValue(props, SmtpPassword, None),
+            getOptionValue[Boolean](props, SmtpSsl, None),
+            getOptionValue[Boolean](props, SmtpStarttls, None),
+            getOptionValue(props, SmtpFromAddress, None),
+            getOptionValue(props, SmtpFromName, None)
+          )
+        )
+      } else None,
+      getValue(props, LdapAuthentication, false),
+      if (getValue(props, LdapAuthentication, false)) {
+        Some(
+          Ldap(
+            getValue(props, LdapHost, ""),
+            getOptionValue(props, LdapPort, Some(DefaultLdapPort)),
+            getOptionValue(props, LdapBindDN, None),
+            getOptionValue(props, LdapBindPassword, None),
+            getValue(props, LdapBaseDN, ""),
+            getValue(props, LdapUserNameAttribute, ""),
+            getOptionValue(props, LdapAdditionalFilterCondition, None),
+            getOptionValue(props, LdapFullNameAttribute, None),
+            getOptionValue(props, LdapMailAddressAttribute, None),
+            getOptionValue[Boolean](props, LdapTls, None),
+            getOptionValue[Boolean](props, LdapSsl, None),
+            getOptionValue(props, LdapKeystore, None)
+          )
+        )
+      } else None,
+      getValue(props, OidcAuthentication, false),
+      if (getValue(props, OidcAuthentication, false)) {
+        Some(
+          OIDC(
+            getValue(props, OidcIssuer, ""),
+            getValue(props, OidcClientId, ""),
+            getValue(props, OidcClientSecret, ""),
+            getOptionValue(props, OidcJwsAlgorithm, None)
+          )
+        )
+      } else {
+        None
+      },
+      getValue(props, SkinName, "skin-blue"),
+      getOptionValue(props, UserDefinedCss, None),
+      getValue(props, ShowMailAddress, false),
+      WebHook(getValue(props, WebHookBlockPrivateAddress, false), getSeqValue(props, WebHookWhitelist, "")),
+      Upload(
+        getValue(props, UploadMaxFileSize, 3 * 1024 * 1024),
+        getValue(props, UploadTimeout, 3 * 10000),
+        getValue(props, UploadLargeMaxFileSize, 3 * 1024 * 1024),
+        getValue(props, UploadLargeTimeout, 3 * 10000)
+      ),
+      RepositoryViewerSettings(
+        getValue(props, RepositoryViewerMaxFiles, 0)
+      )
+    )
  }

 }
@@ -368,12 +365,11 @@ object SystemSettingsService {

  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A = {
    getConfigValue(key).getOrElse {
-      defining(props.getProperty(key)) { value =>
-        if (value == null || value.isEmpty) {
-          default
-        } else {
-          convertType(value).asInstanceOf[A]
-        }
+      val value = props.getProperty(key)
+      if (value == null || value.isEmpty) {
+        default
+      } else {
+        convertType(value).asInstanceOf[A]
      }
    }
  }
@@ -390,12 +386,11 @@ object SystemSettingsService {

  private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] = {
    getConfigValue(key).orElse {
-      defining(props.getProperty(key)) { value =>
-        if (value == null || value.isEmpty) {
-          default
-        } else {
-          Some(convertType(value)).asInstanceOf[Option[A]]
-        }
+      val value = props.getProperty(key)
+      if (value == null || value.isEmpty) {
+        default
+      } else {
+        Some(convertType(value)).asInstanceOf[Option[A]]
      }
    }
  }
--- a/src/main/scala/gitbucket/core/service/WebHookService.scala
+++ b/src/main/scala/gitbucket/core/service/WebHookService.scala
@@ -3,7 +3,6 @@ package gitbucket.core.service
 import fr.brouillard.oss.security.xhub.XHub
 import fr.brouillard.oss.security.xhub.XHub.{XHubConverter, XHubDigest}
 import gitbucket.core.api._
-import gitbucket.core.controller.Context
 import gitbucket.core.model.{
  Account,
  AccountWebHook,
@@ -21,7 +20,6 @@ import gitbucket.core.model.Profile._
 import gitbucket.core.model.Profile.profile.blockingApi._
 import org.apache.http.client.utils.URLEncodedUtils
 import gitbucket.core.util.JGitUtil.CommitInfo
-import gitbucket.core.util.Implicits._
 import gitbucket.core.util.{HttpClientUtil, RepositoryName, StringUtil}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import org.apache.http.NameValuePair
@@ -128,7 +126,7 @@ trait WebHookService {
      ctype = ctype,
      token = token
    )
-    events.map { event: WebHook.Event =>
+    events.map { (event: WebHook.Event) =>
      RepositoryWebHookEvents insert RepositoryWebHookEvent(owner, repository, url, event)
    }
  }
@@ -146,7 +144,7 @@ trait WebHookService {
      .map(w => (w.ctype, w.token))
      .update((ctype, token))
    RepositoryWebHookEvents.filter(_.byRepositoryWebHook(owner, repository, url)).delete
-    events.map { event: WebHook.Event =>
+    events.map { (event: WebHook.Event) =>
      RepositoryWebHookEvents insert RepositoryWebHookEvent(owner, repository, url, event)
    }
  }
@@ -165,7 +163,7 @@ trait WebHookService {
      .map(w => (w.url, w.ctype, w.token))
      .update((url, ctype, token))
    RepositoryWebHookEvents.filter(_.byRepositoryWebHook(owner, repository, url)).delete
-    events.map { event: WebHook.Event =>
+    events.map { (event: WebHook.Event) =>
      RepositoryWebHookEvents insert RepositoryWebHookEvent(owner, repository, url, event)
    }
  }
@@ -230,7 +228,7 @@ trait WebHookService {
    token: Option[String]
  )(implicit s: Session): Unit = {
    AccountWebHooks insert AccountWebHook(owner, url, ctype, token)
-    events.map { event: WebHook.Event =>
+    events.map { (event: WebHook.Event) =>
      AccountWebHookEvents insert AccountWebHookEvent(owner, url, event)
    }
  }
@@ -244,7 +242,7 @@ trait WebHookService {
  )(implicit s: Session): Unit = {
    AccountWebHooks.filter(_.byPrimaryKey(owner, url)).map(w => (w.ctype, w.token)).update((ctype, token))
    AccountWebHookEvents.filter(_.byAccountWebHook(owner, url)).delete
-    events.map { event: WebHook.Event =>
+    events.map { (event: WebHook.Event) =>
      AccountWebHookEvents insert AccountWebHookEvent(owner, url, event)
    }
  }
--- a/src/main/scala/gitbucket/core/service/WikiService.scala
+++ b/src/main/scala/gitbucket/core/service/WikiService.scala
@@ -5,7 +5,6 @@ import gitbucket.core.controller.Context
 import gitbucket.core.model.Account
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.util._
-import gitbucket.core.util.SyntaxSugars._
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.treewalk.CanonicalTreeParser
 import org.eclipse.jgit.lib._
@@ -54,20 +53,19 @@ trait WikiService {

  def createWikiRepository(loginAccount: Account, owner: String, repository: String): Unit =
    LockUtil.lock(s"${owner}/${repository}/wiki") {
-      defining(Directory.getWikiRepositoryDir(owner, repository)) { dir =>
-        if (!dir.exists) {
-          JGitUtil.initRepository(dir)
-          saveWikiPage(
-            owner,
-            repository,
-            "Home",
-            "Home",
-            s"Welcome to the ${repository} wiki!!",
-            loginAccount,
-            "Initial Commit",
-            None
-          )
-        }
+      val dir = Directory.getWikiRepositoryDir(owner, repository)
+      if (!dir.exists) {
+        JGitUtil.initRepository(dir)
+        saveWikiPage(
+          owner,
+          repository,
+          "Home",
+          "Home",
+          s"Welcome to the ${repository} wiki!!",
+          loginAccount,
+          "Initial Commit",
+          None
+        )
      }
    }

--- a/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala
@@ -19,8 +19,9 @@ class ApiAuthenticationFilter extends Filter with AccessTokenService with Accoun
  override def destroy(): Unit = {}

  override def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
-    implicit val request = req.asInstanceOf[HttpServletRequest]
-    implicit val session = req.getAttribute(Keys.Request.DBSession).asInstanceOf[slick.jdbc.JdbcBackend#Session]
+    implicit val request: HttpServletRequest = req.asInstanceOf[HttpServletRequest]
+    implicit val session: slick.jdbc.JdbcBackend#Session =
+      req.getAttribute(Keys.Request.DBSession).asInstanceOf[slick.jdbc.JdbcBackend#Session]
    val response = res.asInstanceOf[HttpServletResponse]
    Option(request.getHeader("Authorization"))
      .map {
--- a/src/main/scala/gitbucket/core/servlet/GitLfsTransferServlet.scala
+++ b/src/main/scala/gitbucket/core/servlet/GitLfsTransferServlet.scala
@@ -6,6 +6,7 @@ import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}

 import gitbucket.core.util.{FileUtil, StringUtil}
 import org.apache.commons.io.{FileUtils, IOUtils}
+import org.json4s.Formats
 import org.json4s.jackson.Serialization._
 import org.apache.http.HttpStatus

@@ -17,7 +18,7 @@ import scala.util.Using
 */
 class GitLfsTransferServlet extends HttpServlet {

-  private implicit val jsonFormats = gitbucket.core.api.JsonFormat.jsonFormats
+  private implicit val jsonFormats: Formats = gitbucket.core.api.JsonFormat.jsonFormats
  private val LongObjectIdLength = 32
  private val LongObjectIdStringLength = LongObjectIdLength * 2

--- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
@@ -6,12 +6,12 @@ import java.util.Date

 import scala.util.Using
 import gitbucket.core.api
+import gitbucket.core.api.JsonFormat.Context
 import gitbucket.core.model.WebHook
 import gitbucket.core.plugin.{GitRepositoryRouting, PluginRegistry}
 import gitbucket.core.service.IssuesService.IssueSearchCondition
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.service._
-import gitbucket.core.util.SyntaxSugars._
 import gitbucket.core.util.Implicits._
 import gitbucket.core.util._
 import gitbucket.core.model.Profile.profile.blockingApi._
@@ -42,6 +42,7 @@ import javax.servlet.ServletConfig
 import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
 import org.eclipse.jgit.diff.DiffEntry.ChangeType
 import org.eclipse.jgit.internal.storage.file.FileRepository
+import org.json4s.Formats
 import org.json4s.jackson.Serialization._

 /**
@@ -53,7 +54,7 @@ import org.json4s.jackson.Serialization._
 class GitRepositoryServlet extends GitServlet with SystemSettingsService {

  private val logger = LoggerFactory.getLogger(classOf[GitRepositoryServlet])
-  private implicit val jsonFormats = gitbucket.core.api.JsonFormat.jsonFormats
+  private implicit val jsonFormats: Formats = gitbucket.core.api.JsonFormat.jsonFormats

  override def init(config: ServletConfig): Unit = {
    setReceivePackFactory(new GitBucketReceivePackFactory())
@@ -200,33 +201,28 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
      logger.debug("requestURI: " + request.getRequestURI)
      logger.debug("pusher:" + pusher)

-      defining(request.paths) { paths =>
-        val owner = paths(1)
-        val repository = paths(2).stripSuffix(".git")
+      val paths = request.paths
+      val owner = paths(1)
+      val repository = paths(2).stripSuffix(".git")

-        logger.debug("repository:" + owner + "/" + repository)
+      logger.debug("repository:" + owner + "/" + repository)

-        val settings = loadSystemSettings()
-        val baseUrl = settings.baseUrl(request)
-        val sshUrl = settings.sshAddress.map { x =>
-          s"${x.genericUser}@${x.host}:${x.port}"
-        }
+      val settings = loadSystemSettings()
+      val baseUrl = settings.baseUrl(request)
+      val sshUrl = settings.sshAddress.map { x =>
+        s"${x.genericUser}@${x.host}:${x.port}"
+      }

-        if (!repository.endsWith(".wiki")) {
-          defining(request) { implicit r =>
-            val hook = new CommitLogHook(owner, repository, pusher, baseUrl, sshUrl)
-            receivePack.setPreReceiveHook(hook)
-            receivePack.setPostReceiveHook(hook)
-          }
-        }
+      if (!repository.endsWith(".wiki")) {
+        val hook = new CommitLogHook(owner, repository, pusher, baseUrl, sshUrl)
+        receivePack.setPreReceiveHook(hook)
+        receivePack.setPostReceiveHook(hook)
+      }

-        if (repository.endsWith(".wiki")) {
-          defining(request) { implicit r =>
-            receivePack.setPostReceiveHook(
-              new WikiCommitHook(owner, repository.stripSuffix(".wiki"), pusher, baseUrl, sshUrl)
-            )
-          }
-        }
+      if (repository.endsWith(".wiki")) {
+        receivePack.setPostReceiveHook(
+          new WikiCommitHook(owner, repository.stripSuffix(".wiki"), pusher, baseUrl, sshUrl)
+        )
      }
    }

@@ -293,7 +289,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
          val pushedIds = scala.collection.mutable.Set[String]()
          commands.asScala.foreach { command =>
            logger.debug(s"commandType: ${command.getType}, refName: ${command.getRefName}")
-            implicit val apiContext = api.JsonFormat.Context(baseUrl, sshUrl)
+            implicit val apiContext: Context = api.JsonFormat.Context(baseUrl, sshUrl)
            val refName = command.getRefName.split("/")
            val branchName = refName.drop(2).mkString("/")
            val commits = if (refName(1) == "tags") {
@@ -469,7 +465,7 @@ class WikiCommitHook(owner: String, repository: String, pusher: String, baseUrl:
    Database() withTransaction { implicit session =>
      try {
        commands.asScala.headOption.foreach { command =>
-          implicit val apiContext = api.JsonFormat.Context(baseUrl, sshUrl)
+          implicit val apiContext: Context = api.JsonFormat.Context(baseUrl, sshUrl)
          val refName = command.getRefName.split("/")
          val commitIds = if (refName(1) == "tags") {
            None
--- a/src/main/scala/gitbucket/core/servlet/InitializeListener.scala
+++ b/src/main/scala/gitbucket/core/servlet/InitializeListener.scala
@@ -2,7 +2,6 @@ package gitbucket.core.servlet

 import java.io.{File, FileOutputStream}

-import com.typesafe.config.ConfigFactory
 import gitbucket.core.GitBucketCoreModule
 import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.service.SystemSettingsService
--- a/src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/PluginControllerFilter.scala
@@ -1,7 +1,6 @@
 package gitbucket.core.servlet

 import javax.servlet._
-import javax.servlet.http.HttpServletRequest

 import gitbucket.core.controller.ControllerBase
 import gitbucket.core.plugin.PluginRegistry
--- a/src/main/scala/gitbucket/core/ssh/GitCommand.scala
+++ b/src/main/scala/gitbucket/core/ssh/GitCommand.scala
@@ -4,7 +4,7 @@ import gitbucket.core.model.Profile.profile.blockingApi._
 import gitbucket.core.plugin.{GitRepositoryRouting, PluginRegistry}
 import gitbucket.core.service.{AccountService, DeployKeyService, RepositoryService, SystemSettingsService}
 import gitbucket.core.servlet.{CommitLogHook, Database}
-import gitbucket.core.util.{SyntaxSugars, Directory}
+import gitbucket.core.util.Directory
 import org.apache.sshd.server.{Environment, ExitCallback, SessionAware}
 import org.apache.sshd.server.command.{Command, CommandFactory}
 import org.apache.sshd.server.session.ServerSession
--- a/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
+++ b/src/main/scala/gitbucket/core/ssh/SshServerListener.scala
@@ -1,6 +1,5 @@
 package gitbucket.core.ssh

-import java.io.File
 import java.util.concurrent.atomic.AtomicBoolean
 import javax.servlet.{ServletContextEvent, ServletContextListener}

--- a/src/main/scala/gitbucket/core/util/Authenticator.scala
+++ b/src/main/scala/gitbucket/core/util/Authenticator.scala
@@ -5,7 +5,6 @@ import gitbucket.core.service.{AccountService, RepositoryService}
 import gitbucket.core.model.Role
 import RepositoryService.RepositoryInfo
 import Implicits._
-import SyntaxSugars._

 /**
 * Allows only oneself and administrators.
@@ -113,13 +112,10 @@ trait ReadableUsersAuthenticator { self: ControllerBase with RepositoryService w
    val userName = params("owner")
    val repoName = params("repository")
    getRepository(userName, repoName).map { repository =>
-      context.loginAccount match {
-        case Some(x) if (x.isAdmin)                                                          => action(repository)
-        case Some(x) if (!repository.repository.isPrivate)                                   => action(repository)
-        case Some(x) if (userName == x.userName)                                             => action(repository)
-        case Some(x) if (getGroupMembers(repository.owner).exists(_.userName == x.userName)) => action(repository)
-        case Some(x) if (getCollaboratorUserNames(userName, repoName).contains(x.userName))  => action(repository)
-        case _                                                                               => Unauthorized()
+      if (isReadable(repository.repository, context.loginAccount) || !repository.repository.isPrivate) {
+        action(repository)
+      } else {
+        Unauthorized()
      }
    } getOrElse NotFound()
  }
--- a/src/main/scala/gitbucket/core/util/ConfigUtil.scala
+++ b/src/main/scala/gitbucket/core/util/ConfigUtil.scala
@@ -1,7 +1,5 @@
 package gitbucket.core.util

-import gitbucket.core.util.SyntaxSugars.defining
-
 import scala.reflect.ClassTag

 object ConfigUtil {
@@ -30,12 +28,12 @@ object ConfigUtil {
    }
  }

-  def convertType[A: ClassTag](value: String): A =
-    defining(implicitly[ClassTag[A]].runtimeClass) { c =>
-      if (c == classOf[Boolean]) value.toBoolean
-      else if (c == classOf[Long]) value.toLong
-      else if (c == classOf[Int]) value.toInt
-      else value
-    }.asInstanceOf[A]
+  def convertType[A: ClassTag](value: String): A = {
+    val c = implicitly[ClassTag[A]].runtimeClass
+    if (c == classOf[Boolean]) value.toBoolean
+    else if (c == classOf[Long]) value.toLong
+    else if (c == classOf[Int]) value.toInt
+    else value
+  }.asInstanceOf[A]

 }
--- a/src/main/scala/gitbucket/core/util/EditorConfigUtil.scala
+++ b/src/main/scala/gitbucket/core/util/EditorConfigUtil.scala
@@ -28,7 +28,7 @@ object EditorConfigUtil {
    }

    private def getRevTree: RevTree = {
-      Using.resource(repo.newObjectReader()) { reader: ObjectReader =>
+      Using.resource(repo.newObjectReader()) { (reader: ObjectReader) =>
        val revWalk = new RevWalk(reader)
        val id = repo.resolve(revStr)
        val commit = revWalk.parseCommit(id)
@@ -37,7 +37,7 @@ object EditorConfigUtil {
    }

    override def exists(): Boolean = {
-      Using.resource(repo.newObjectReader()) { reader: ObjectReader =>
+      Using.resource(repo.newObjectReader()) { (reader: ObjectReader) =>
        try {
          val treeWalk = Option(TreeWalk.forPath(reader, removeInitialSlash(path), getRevTree))
          treeWalk.isDefined
@@ -60,7 +60,7 @@ object EditorConfigUtil {
    }

    override def openReader(): Reader = {
-      Using.resource(repo.newObjectReader) { reader: ObjectReader =>
+      Using.resource(repo.newObjectReader) { (reader: ObjectReader) =>
        val treeWalk = TreeWalk.forPath(reader, removeInitialSlash(path), getRevTree)
        new InputStreamReader(reader.open(treeWalk.getObjectId(0)).openStream, StandardCharsets.UTF_8)
      }
--- a/src/main/scala/gitbucket/core/util/FileUtil.scala
+++ b/src/main/scala/gitbucket/core/util/FileUtil.scala
@@ -3,36 +3,39 @@ package gitbucket.core.util
 import org.apache.commons.io.FileUtils
 import org.apache.tika.Tika
 import java.io.File
-import SyntaxSugars._
 import scala.util.Random

 object FileUtil {

-  def getMimeType(name: String): String =
-    defining(new Tika()) { tika =>
-      tika.detect(name) match {
-        case null     => "application/octet-stream"
-        case mimeType => mimeType
-      }
+  def getMimeType(name: String): String = {
+    val tika = new Tika()
+    tika.detect(name) match {
+      case null     => "application/octet-stream"
+      case mimeType => mimeType
    }
+  }

  def getMimeType(name: String, bytes: Array[Byte]): String = {
-    defining(getMimeType(name)) { mimeType =>
-      if (mimeType == "application/octet-stream" && isText(bytes)) {
-        "text/plain"
-      } else {
-        mimeType
-      }
+    val mimeType = getMimeType(name)
+    if (mimeType == "application/octet-stream" && isText(bytes)) {
+      "text/plain"
+    } else {
+      mimeType
    }
  }

-  def getSafeMimeType(name: String): String = {
-    getMimeType(name)
+  def getSafeMimeType(name: String, safeMode: Boolean = true): String = {
+    val mimeType = getMimeType(name)
      .replace("text/html", "text/plain")
-      .replace("image/svg+xml", "text/plain; charset=UTF-8")
+
+    if (safeMode) {
+      mimeType.replace("image/svg+xml", "text/plain; charset=UTF-8")
+    } else {
+      mimeType
+    }
  }

-  def isImage(name: String): Boolean = getSafeMimeType(name).startsWith("image/")
+  def isImage(name: String, safeMode: Boolean = true): Boolean = getSafeMimeType(name, safeMode).startsWith("image/")

  def isLarge(size: Long): Boolean = (size > 1024 * 1000)

@@ -92,4 +95,14 @@ object FileUtil {
    name
  }

+  /**
+   * Delete given folder recursively.
+   */
+  def deleteRecursively(f: File): Boolean = {
+    if (f.isDirectory) f.listFiles match {
+      case files: Array[File] => files.foreach(deleteRecursively)
+      case null               =>
+    }
+    f.delete()
+  }
 }
--- a/src/main/scala/gitbucket/core/util/HttpClientUtil.scala
+++ b/src/main/scala/gitbucket/core/util/HttpClientUtil.scala
@@ -1,6 +1,6 @@
 package gitbucket.core.util

-import java.net.{InetAddress, URL}
+import java.net.InetAddress

 import gitbucket.core.service.SystemSettingsService
 import org.apache.commons.net.util.SubnetUtils
--- a/src/main/scala/gitbucket/core/util/JDBCUtil.scala
+++ b/src/main/scala/gitbucket/core/util/JDBCUtil.scala
@@ -83,7 +83,9 @@ object JDBCUtil {
              }
              if (c == ';' && !stringLiteral) {
                val sql = new String(out.toByteArray, "UTF-8")
-                conn.update(sql.trim)
+                if (sql != null && !sql.isEmpty()) {
+                  conn.update(sql.trim)
+                }
                out = new ByteArrayOutputStream()
              } else {
                out.write(c)
--- a/src/main/scala/gitbucket/core/util/JGitUtil.scala
+++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala
@@ -6,7 +6,6 @@ import gitbucket.core.service.RepositoryService
 import org.eclipse.jgit.api.Git
 import Directory._
 import StringUtil._
-import SyntaxSugars._

 import scala.annotation.tailrec
 import scala.jdk.CollectionConverters._
@@ -38,7 +37,7 @@ object JGitUtil {

  private val logger = LoggerFactory.getLogger(JGitUtil.getClass)

-  implicit val objectDatabaseReleasable = new Releasable[ObjectDatabase] {
+  implicit val objectDatabaseReleasable: Releasable[ObjectDatabase] = new Releasable[ObjectDatabase] {
    override def release(resource: ObjectDatabase): Unit = resource.close()
  }

@@ -183,7 +182,8 @@ object JGitUtil {

    val summary = getSummaryMessage(fullMessage, shortMessage)

-    val description = defining(fullMessage.trim.indexOf('\n')) { i =>
+    val description = {
+      val i = fullMessage.trim.indexOf('\n')
      if (i >= 0) {
        Some(fullMessage.trim.substring(i).trim)
      } else None
@@ -514,11 +514,9 @@ object JGitUtil {
   * Returns the first line of the commit message.
   */
  private def getSummaryMessage(fullMessage: String, shortMessage: String): String = {
-    defining(fullMessage.trim.indexOf('\n')) { i =>
-      defining(if (i >= 0) fullMessage.trim.substring(0, i).trim else fullMessage) { firstLine =>
-        if (firstLine.length > shortMessage.length) shortMessage else firstLine
-      }
-    }
+    val i = fullMessage.trim.indexOf('\n')
+    val firstLine = if (i >= 0) fullMessage.trim.substring(0, i).trim else fullMessage
+    if (firstLine.length > shortMessage.length) shortMessage else firstLine
  }

  /**
@@ -592,16 +590,15 @@ object JGitUtil {
      }

    Using.resource(new RevWalk(git.getRepository)) { revWalk =>
-      defining(git.getRepository.resolve(revision)) { objectId =>
-        if (objectId == null) {
-          Left(s"${revision} can't be resolved.")
-        } else {
-          revWalk.markStart(revWalk.parseCommit(objectId))
-          if (path.nonEmpty) {
-            revWalk.setTreeFilter(AndTreeFilter.create(PathFilter.create(path), TreeFilter.ANY_DIFF))
-          }
-          Right(getCommitLog(revWalk.iterator, 0, Nil))
+      val objectId = git.getRepository.resolve(revision)
+      if (objectId == null) {
+        Left(s"${revision} can't be resolved.")
+      } else {
+        revWalk.markStart(revWalk.parseCommit(objectId))
+        if (path.nonEmpty) {
+          revWalk.setTreeFilter(AndTreeFilter.create(PathFilter.create(path), TreeFilter.ANY_DIFF))
        }
+        Right(getCommitLog(revWalk.iterator, 0, Nil))
      }
    }
  }
@@ -804,22 +801,21 @@ object JGitUtil {
   */
  def getBranchesOfCommit(git: Git, commitId: String): List[String] =
    Using.resource(new RevWalk(git.getRepository)) { revWalk =>
-      defining(revWalk.parseCommit(git.getRepository.resolve(commitId + "^0"))) { commit =>
-        git.getRepository.getRefDatabase
-          .getRefsByPrefix(Constants.R_HEADS)
-          .asScala
-          .filter { e =>
-            (revWalk.isMergedInto(
-              commit,
-              revWalk.parseCommit(e.getObjectId)
-            ))
-          }
-          .map { e =>
-            e.getName.substring(Constants.R_HEADS.length)
-          }
-          .toList
-          .sorted
-      }
+      val commit = revWalk.parseCommit(git.getRepository.resolve(commitId + "^0"))
+      git.getRepository.getRefDatabase
+        .getRefsByPrefix(Constants.R_HEADS)
+        .asScala
+        .filter { e =>
+          (revWalk.isMergedInto(
+            commit,
+            revWalk.parseCommit(e.getObjectId)
+          ))
+        }
+        .map { e =>
+          e.getName.substring(Constants.R_HEADS.length)
+        }
+        .toList
+        .sorted
    }

  /**
@@ -847,23 +843,22 @@ object JGitUtil {
   */
  def getTagsOfCommit(git: Git, commitId: String): List[String] =
    Using.resource(new RevWalk(git.getRepository)) { revWalk =>
-      defining(revWalk.parseCommit(git.getRepository.resolve(commitId + "^0"))) { commit =>
-        git.getRepository.getRefDatabase
-          .getRefsByPrefix(Constants.R_TAGS)
-          .asScala
-          .filter { e =>
-            (revWalk.isMergedInto(
-              commit,
-              revWalk.parseCommit(e.getObjectId)
-            ))
-          }
-          .map { e =>
-            e.getName.substring(Constants.R_TAGS.length)
-          }
-          .toList
-          .sorted
-          .reverse
-      }
+      val commit = revWalk.parseCommit(git.getRepository.resolve(commitId + "^0"))
+      git.getRepository.getRefDatabase
+        .getRefsByPrefix(Constants.R_TAGS)
+        .asScala
+        .filter { e =>
+          (revWalk.isMergedInto(
+            commit,
+            revWalk.parseCommit(e.getObjectId)
+          ))
+        }
+        .map { e =>
+          e.getName.substring(Constants.R_TAGS.length)
+        }
+        .toList
+        .sorted
+        .reverse
    }

  def initRepository(dir: java.io.File): Unit =
@@ -879,11 +874,11 @@ object JGitUtil {

  def isEmpty(git: Git): Boolean = git.getRepository.resolve(Constants.HEAD) == null

-  private def setReceivePack(repository: org.eclipse.jgit.lib.Repository): Unit =
-    defining(repository.getConfig) { config =>
-      config.setBoolean("http", null, "receivepack", true)
-      config.save
-    }
+  private def setReceivePack(repository: org.eclipse.jgit.lib.Repository): Unit = {
+    val config = repository.getConfig
+    config.setBoolean("http", null, "receivepack", true)
+    config.save
+  }

  def getDefaultBranch(
    git: Git,
@@ -912,10 +907,10 @@ object JGitUtil {
      }
      Right("Tag added.")
    } catch {
-      case e: ConcurrentRefUpdateException => Left("Sorry, some error occurs.")
-      case e: InvalidTagNameException      => Left("Sorry, that name is invalid.")
-      case e: NoHeadException              => Left("Sorry, this repo doesn't have HEAD reference")
-      case e: GitAPIException              => Left("Sorry, some Git operation error occurs.")
+      case _: ConcurrentRefUpdateException => Left("Sorry, some error occurs.")
+      case _: InvalidTagNameException      => Left("Sorry, that name is invalid.")
+      case _: NoHeadException              => Left("Sorry, this repo doesn't have HEAD reference")
+      case _: GitAPIException              => Left("Sorry, some Git operation error occurs.")
    }
  }

@@ -924,7 +919,7 @@ object JGitUtil {
      git.branchCreate().setStartPoint(fromBranch).setName(newBranch).call()
      Right("Branch created.")
    } catch {
-      case e: RefAlreadyExistsException => Left("Sorry, that branch already exists.")
+      case _: RefAlreadyExistsException => Left("Sorry, that branch already exists.")
      // JGitInternalException occurs when new branch name is 'a' and the branch whose name is 'a/*' exists.
      case _: InvalidRefNameException | _: JGitInternalException => Left("Sorry, that name is invalid.")
    }
@@ -1052,13 +1047,13 @@ object JGitUtil {
    !loader.isLarge && new String(loader.getBytes(), "UTF-8").startsWith("version https://git-lfs.github.com/spec/v1")
  }

-  def getContentInfo(git: Git, path: String, objectId: ObjectId): ContentInfo = {
+  def getContentInfo(git: Git, path: String, objectId: ObjectId, safeMode: Boolean): ContentInfo = {
    // Viewer
    Using.resource(git.getRepository.getObjectDatabase) { db =>
      val loader = db.open(objectId)
      val isLfs = isLfsPointer(loader)
      val large = FileUtil.isLarge(loader.getSize)
-      val viewer = if (FileUtil.isImage(path)) "image" else if (large) "large" else "other"
+      val viewer = if (FileUtil.isImage(path, safeMode)) "image" else if (large) "large" else "other"
      val bytes = if (viewer == "other") JGitUtil.getContentFromId(git, objectId, false) else None
      val size = Some(getContentSize(loader))

@@ -1101,7 +1096,7 @@ object JGitUtil {
        }
      }
    } catch {
-      case e: MissingObjectException => None
+      case _: MissingObjectException => None
    }

  /**
@@ -1118,7 +1113,7 @@ object JGitUtil {
        Some(f(db.open(id)))
      }
    } catch {
-      case e: MissingObjectException => None
+      case _: MissingObjectException => None
    }

  /**
@@ -1162,12 +1157,12 @@ object JGitUtil {
    requestUserName: String,
    requestRepositoryName: String,
    requestBranch: String
-  ): String =
-    defining(getAllCommitIds(oldGit)) { existIds =>
-      getCommitLogs(newGit, requestBranch, true) { commit =>
-        existIds.contains(commit.name) && getBranchesOfCommit(oldGit, commit.getName).contains(branch)
-      }.head.id
-    }
+  ): String = {
+    val existIds = getAllCommitIds(oldGit)
+    getCommitLogs(newGit, requestBranch, true) { commit =>
+      existIds.contains(commit.name) && getBranchesOfCommit(oldGit, commit.getName).contains(branch)
+    }.head.id
+  }

  /**
   * Fetch pull request contents into refs/pull/${issueId}/head and return (commitIdTo, commitIdFrom)
--- a/src/main/scala/gitbucket/core/util/LDAPUtil.scala
+++ b/src/main/scala/gitbucket/core/util/LDAPUtil.scala
@@ -1,7 +1,6 @@
 package gitbucket.core.util

 import gitbucket.core.model.Account
-import SyntaxSugars._
 import gitbucket.core.service.SystemSettingsService
 import gitbucket.core.service.SystemSettingsService.Ldap
 import com.novell.ldap._
@@ -246,20 +245,18 @@ object LDAPUtil {
    userNameAttribute: String,
    userName: String,
    mailAttribute: String
-  ): Option[String] =
-    defining(
-      conn.search(
-        userDN,
-        LDAPConnection.SCOPE_BASE,
-        userNameAttribute + "=" + userName,
-        Array[String](mailAttribute),
-        false
-      )
-    ) { results =>
-      if (results.hasMore) {
-        Option(results.next.getAttribute(mailAttribute)).map(_.getStringValue)
-      } else None
-    }
+  ): Option[String] = {
+    val results = conn.search(
+      userDN,
+      LDAPConnection.SCOPE_BASE,
+      userNameAttribute + "=" + userName,
+      Array[String](mailAttribute),
+      false
+    )
+    if (results.hasMore) {
+      Option(results.next.getAttribute(mailAttribute)).map(_.getStringValue)
+    } else None
+  }

  private def findFullName(
    conn: LDAPConnection,
@@ -267,20 +264,18 @@ object LDAPUtil {
    userNameAttribute: String,
    userName: String,
    nameAttribute: String
-  ): Option[String] =
-    defining(
-      conn.search(
-        userDN,
-        LDAPConnection.SCOPE_BASE,
-        userNameAttribute + "=" + userName,
-        Array[String](nameAttribute),
-        false
-      )
-    ) { results =>
-      if (results.hasMore) {
-        Option(results.next.getAttribute(nameAttribute)).map(_.getStringValue)
-      } else None
-    }
+  ): Option[String] = {
+    val results = conn.search(
+      userDN,
+      LDAPConnection.SCOPE_BASE,
+      userNameAttribute + "=" + userName,
+      Array[String](nameAttribute),
+      false
+    )
+    if (results.hasMore) {
+      Option(results.next.getAttribute(nameAttribute)).map(_.getStringValue)
+    } else None
+  }

  case class LDAPUserInfo(userName: String, fullName: String, mailAddress: String)

--- a/src/main/scala/gitbucket/core/util/LockUtil.scala
+++ b/src/main/scala/gitbucket/core/util/LockUtil.scala
@@ -2,7 +2,6 @@ package gitbucket.core.util

 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.locks.{ReentrantLock, Lock}
-import SyntaxSugars._

 object LockUtil {

@@ -24,7 +23,8 @@ object LockUtil {
  /**
   * Synchronizes a given function which modifies the working copy of the wiki repository.
   */
-  def lock[T](key: String)(f: => T): T = defining(getLockObject(key)) { lock =>
+  def lock[T](key: String)(f: => T): T = {
+    val lock = getLockObject(key)
    try {
      lock.lock()
      f
--- a/src/main/scala/gitbucket/core/util/StringUtil.scala
+++ b/src/main/scala/gitbucket/core/util/StringUtil.scala
@@ -5,7 +5,6 @@ import java.security.SecureRandom
 import java.util.{Base64, UUID}

 import org.mozilla.universalchardet.UniversalDetector
-import SyntaxSugars._
 import javax.crypto.SecretKeyFactory
 import javax.crypto.spec.PBEKeySpec
 import org.apache.commons.io.input.BOMInputStream
@@ -45,11 +44,11 @@ object StringUtil {
    s"""$$pbkdf2-sha256$$${iter}$$${base64Encode(salt)}$$${base64Encode(s.getEncoded)}"""
  }

-  def sha1(value: String): String =
-    defining(java.security.MessageDigest.getInstance("SHA-1")) { md =>
-      md.update(value.getBytes)
-      md.digest.map(b => "%02x".format(b)).mkString
-    }
+  def sha1(value: String): String = {
+    val md = java.security.MessageDigest.getInstance("SHA-1")
+    md.update(value.getBytes)
+    md.digest.map(b => "%02x".format(b)).mkString
+  }

  def md5(value: String): String = {
    val md = java.security.MessageDigest.getInstance("MD5")
@@ -89,15 +88,15 @@ object StringUtil {
  def convertFromByteArray(content: Array[Byte]): String =
    IOUtils.toString(new BOMInputStream(new java.io.ByteArrayInputStream(content)), detectEncoding(content))

-  def detectEncoding(content: Array[Byte]): String =
-    defining(new UniversalDetector(null)) { detector =>
-      detector.handleData(content, 0, content.length)
-      detector.dataEnd()
-      detector.getDetectedCharset match {
-        case null => "UTF-8"
-        case e    => e
-      }
+  def detectEncoding(content: Array[Byte]): String = {
+    val detector = new UniversalDetector(null)
+    detector.handleData(content, 0, content.length)
+    detector.dataEnd()
+    detector.getDetectedCharset match {
+      case null => "UTF-8"
+      case e    => e
    }
+  }

  /**
   * Converts line separator in the given content.
@@ -144,6 +143,19 @@ object StringUtil {
      .toSeq
      .distinct

+  /**
+   * Extract issue id like ```owner/repository#issueId``` from the given message.
+   *
+   *@param message the message which may contains issue id
+   * @return the iterator of issue id
+   */
+  def extractGlobalIssueId(message: String): List[(Option[String], Option[String], Option[String])] =
+    "\\s?([\\w-\\.]+)?\\/?([\\w\\-\\.]+)?#(\\d+)\\s?".r
+      .findAllIn(message)
+      .matchData
+      .map(i => (Option(i.group(1)), Option(i.group(2)), Option(i.group(3))))
+      .toList
+
  /**
   * Extract close issue id like ```close #issueId ``` from the given message.
   *
--- a/src/main/scala/gitbucket/core/util/SyntaxSugars.scala
+++ b/src/main/scala/gitbucket/core/util/SyntaxSugars.scala
@@ -1,56 +1,14 @@
 package gitbucket.core.util

-import org.eclipse.jgit.api.Git
-import scala.util.control.Exception._
-import scala.language.reflectiveCalls
-
 /**
 * Provides control facilities.
 */
 object SyntaxSugars {

+  @deprecated("Use scala.util.Try instead", "4.36.0")
  def defining[A, B](value: A)(f: A => B): B = f(value)

-  @deprecated("Use scala.util.Using.resource instead", "4.32.0")
-  def using[A <: { def close(): Unit }, B](resource: A)(f: A => B): B =
-    try f(resource)
-    finally {
-      if (resource != null) {
-        ignoring(classOf[Throwable]) {
-          resource.close()
-        }
-      }
-    }
-
-  @deprecated("Use scala.util.Using.resources instead", "4.32.0")
-  def using[A <: { def close(): Unit }, B <: { def close(): Unit }, C](resource1: A, resource2: B)(f: (A, B) => C): C =
-    try f(resource1, resource2)
-    finally {
-      if (resource1 != null) {
-        ignoring(classOf[Throwable]) {
-          resource1.close()
-        }
-      }
-      if (resource2 != null) {
-        ignoring(classOf[Throwable]) {
-          resource2.close()
-        }
-      }
-    }
-
-  @deprecated("Use scala.util.Using.resource instead", "4.32.0")
-  def using[T](git: Git)(f: Git => T): T =
-    try f(git)
-    finally git.getRepository.close()
-
-  @deprecated("Use scala.util.Using.resources instead", "4.32.0")
-  def using[T](git1: Git, git2: Git)(f: (Git, Git) => T): T =
-    try f(git1, git2)
-    finally {
-      git1.getRepository.close()
-      git2.getRepository.close()
-    }
-
+  @deprecated("Use scala.util.Try instead", "4.36.0")
  def ignore[T](f: => Unit): Unit =
    try {
      f
--- a/src/main/scala/gitbucket/core/util/TextAvatarUtil.scala
+++ b/src/main/scala/gitbucket/core/util/TextAvatarUtil.scala
@@ -3,7 +3,7 @@ package gitbucket.core.util
 import java.io.ByteArrayOutputStream
 import java.awt.image.BufferedImage
 import javax.imageio.ImageIO
-import java.awt.{Color, Font, Graphics2D, RenderingHints}
+import java.awt.{Color, Font, RenderingHints}
 import java.awt.font.{FontRenderContext, TextLayout}
 import java.awt.geom.AffineTransform

--- a/src/main/scala/gitbucket/core/view/LinkConverter.scala
+++ b/src/main/scala/gitbucket/core/view/LinkConverter.scala
@@ -10,21 +10,33 @@ trait LinkConverter { self: RequestCache =>
  /**
   * Creates a link to the issue or the pull request from the issue id.
   */
-  protected def createIssueLink(repository: RepositoryService.RepositoryInfo, issueId: Int, title: String)(
+  protected def createIssueLink(owner: String, repository: String, issueId: Int, title: String)(
    implicit context: Context
  ): String = {
-    val userName = repository.repository.userName
-    val repositoryName = repository.repository.repositoryName
-
-    getIssueFromCache(userName, repositoryName, issueId.toString) match {
+    getIssueFromCache(owner, repository, issueId.toString) match {
      case Some(issue) =>
-        s"""<a href="${context.path}/${userName}/${repositoryName}/${if (issue.isPullRequest) "pull" else "issues"}/${issueId}"><strong>${StringUtil
+        s"""<a href="${context.path}/${owner}/${repository}/${if (issue.isPullRequest) "pull" else "issues"}/${issueId}"><strong>${StringUtil
          .escapeHtml(title)}</strong> #${issueId}</a>"""
      case None =>
        s"Unknown #${issueId}"
    }
  }

+  /**
+   * Creates a global link to the issue or the pull request from the issue id.
+   */
+  protected def createGlobalIssueLink(owner: String, repository: String, issueId: Int, title: String)(
+    implicit context: Context
+  ): String = {
+    getIssueFromCache(owner, repository, issueId.toString) match {
+      case Some(issue) =>
+        s"""<a href="${context.path}/${owner}/${repository}/${if (issue.isPullRequest) "pull" else "issues"}/${issueId}"><strong>${StringUtil
+          .escapeHtml(title)}</strong> ${owner}/${repository}#${issueId}</a>"""
+      case None =>
+        s"Unknown ${owner}/${repository}#${issueId}"
+    }
+  }
+
  /**
   * Converts issue id, username and commit id to link in the given text.
   */
--- a/src/main/scala/gitbucket/core/view/helpers.scala
+++ b/src/main/scala/gitbucket/core/view/helpers.scala
@@ -10,6 +10,8 @@ import gitbucket.core.plugin.{PluginRegistry, RenderRequest}
 import gitbucket.core.service.RepositoryService.RepositoryInfo
 import gitbucket.core.service.{RepositoryService, RequestCache}
 import gitbucket.core.util.{FileUtil, JGitUtil, StringUtil}
+import org.apache.commons.codec.digest.DigestUtils
+import org.json4s.Formats
 import play.twirl.api.{Html, HtmlFormat}

 /**
@@ -158,10 +160,19 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
  /**
   * Creates a link to the issue or the pull request from the issue id.
   */
-  def issueLink(repository: RepositoryService.RepositoryInfo, issueId: Int, title: String)(
+  def issueLink(owner: String, repository: String, issueId: Int, title: String)(
    implicit context: Context
  ): Html = {
-    Html(createIssueLink(repository, issueId, title))
+    Html(createIssueLink(owner, repository, issueId, title))
+  }
+
+  /**
+   * Creates a global link to the issue or the pull request from the issue id.
+   */
+  def issueGlobalLink(owner: String, repository: String, issueId: Int, title: String)(
+    implicit context: Context
+  ): Html = {
+    Html(createGlobalIssueLink(owner, repository, issueId, title))
  }

  /**
@@ -386,7 +397,7 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   * Render a given object as the JSON string.
   */
  def json(obj: AnyRef): String = {
-    implicit val formats = org.json4s.DefaultFormats
+    implicit val formats: Formats = org.json4s.DefaultFormats
    org.json4s.jackson.Serialization.write(obj)
  }

@@ -471,7 +482,7 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
  def diff(jsonString: String): Html = {
    import org.json4s._
    import org.json4s.jackson.JsonMethods._
-    implicit val formats = DefaultFormats
+    implicit val formats: Formats = DefaultFormats

    val diff = parse(jsonString).extract[Seq[CommentDiffLine]]

@@ -506,4 +517,6 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
    s"$baseUrl${if (baseUrl.contains("?")) "&" else "?"}$queryString"
  }

+  def md5(value: String): String = DigestUtils.md5Hex(value)
+
 }
--- a/src/main/twirl/gitbucket/core/account/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/account/edit.scala.html
@@ -72,7 +72,8 @@ $(function(){
  addExtraMailAddress();
  $('#extraMailAddresses').on('change', '.extraMailAddress', checkExtraMailAddress);
  $('#save').click(function(){
-    if($('#password').val() != ''){
+    let pwval = $('#password').val();
+    if(typeof(pwval) != 'undefined' && pwval != ''){
      return confirm('Are you sure you want to change password?');
    } else {
      return true;
--- a/src/main/twirl/gitbucket/core/helper/activities.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/activities.scala.html
@@ -58,6 +58,7 @@
              </div>
          }
        }
+        case "delete_wiki" => simpleActivity(activity)
      })
    </div>
  }
--- a/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/branchcontrol.scala.html
@@ -4,58 +4,119 @@
@import gitbucket.core.view.helpers
@gitbucket.core.helper.html.dropdown(
  value  = if(branch.length == 40) branch.substring(0, 10) else branch,
-  prefix = if(branch.length == 40) "tree" else if(repository.branchList.contains(branch)) "branch" else "tree",
+  prefix = if(repository.branchList.contains(branch)) "branch" else if (repository.tags.map(_.name).contains(branch)) "tag" else "tree",
+  style = "min-width: 200px;",
  maxValueWidth = "200px"
 ) {
-  <li><div id="branch-control-title">Switch branches<button id="branch-control-close" class="pull-right">&times</button></div></li>
-  <li><input id="branch-control-input" type="text" class="form-control input-sm dropdown-filter-input" placeholder="Find or create branch ..."/></li>
-  @body
-  @if(hasWritePermission) {
-    <li id="create-branch" style="display: none;">
-      <a><form action="@helpers.url(repository)/branches" method="post" style="margin: 0;">
-        <span class="strong">Create branch:&nbsp;<span class="new-branch"></span></span>
-        <br><span style="padding-left: 17px;">from&nbsp;'@branch'</span>
-        <input type="hidden" name="new">
-        <input type="hidden" name="from" value="@branch">
-      </form></a>
+  <li>
+    <ul class="nav nav-tabs">
+      <li class="active" id="branch-control-tab-branches"><a href="javascript:void(0);" class="nav-item" id="nav-item-branches">Branches</a></li>
+      <li id="branch-control-tab-tags"><a href="javascript:void(0);" class="nav-item" id="nav-item-tags">Tags</a></li>
+      <li><button id="branch-control-close" class="pull-right">&times</button></li>
+    </ul>
+    <li>
+      <input id="branch-control-input" type="text" class="form-control input-sm dropdown-filter-input"/>
    </li>
-  }
+    @body
+    @if(hasWritePermission) {
+      <li id="create-branch" style="display: none;">
+        <a><form action="@helpers.url(repository)/branches" method="post" style="margin: 0;">
+          <span class="strong">Create branch:&nbsp;<span class="new-branch"></span></span>
+          <br><span style="padding-left: 17px;">from&nbsp;'@branch'</span>
+          <input type="hidden" name="new">
+          <input type="hidden" name="from" value="@branch">
+        </form></a>
+      </li>
+    }
+  </li>
 }
 <script>
  $(function(){
    $('#branch-control-input').parent().click(function(e) {
      e.stopPropagation();
    });
+
    $('#branch-control-close').click(function() {
      $('[data-toggle="dropdown"]').parent().removeClass('open');
    });
+
    $('#branch-control-input').keyup(function() {
-      var inputVal = $('#branch-control-input').val();
-      $.each($('#branch-control-input').parent().parent().find('a'), function(index, elem) {
-        if (!inputVal || !elem.text.trim() || elem.text.trim().toLowerCase().indexOf(inputVal.toLowerCase()) >= 0) {
-          $(elem).parent().show();
-        } else {
-          $(elem).parent().hide();
-        }
-      });
-      @if(hasWritePermission) {
-        if (inputVal) {
-          $('#create-branch').parent().find('li:last-child').show().find('.new-branch').text(inputVal);
-        } else {
-          $('#create-branch').parent().find('li:last-child').hide();
-        }
-      }
+      updateBranchControlListFilter();
    });
+
    @if(hasWritePermission) {
      $('#create-branch').click(function() {
        $(this).find('input[name="new"]').val($('.dropdown-menu input').val())
        $(this).find('form').submit()
       });
    }
+
    $('.btn-group').click(function() {
      $('#branch-control-input').val('');
-      $('.dropdown-menu li').show();
+      //$('.dropdown-menu li').show();
      $('#create-branch').hide();
    });
+
+    $('#nav-item-branches').click(function(e) {
+      e.stopPropagation();
+      updateBranchControlList('branches');
+    });
+
+    $('#nav-item-tags').click(function(e) {
+      e.stopPropagation();
+      updateBranchControlList('tags');
+    });
+
+    function updateBranchControlList(active) {
+      if (active == 'branches') {
+        $('li#branch-control-tab-branches').addClass('active');
+        $('li#branch-control-tab-tags').removeClass('active');
+
+        $('li.branch-control-item-branch').show();
+        $('li.branch-control-item-branch > a').addClass('active');
+
+        $('li.branch-control-item-tag').hide();
+        $('li.branch-control-item-tag > a').removeClass('active');
+        @if(hasWritePermission) {
+          $('#branch-control-input').attr('placeholder', 'Find or create branch ...');
+        } else {
+          $('#branch-control-input').attr('placeholder', 'Find branch ...');
+        }
+      } else if (active == 'tags') {
+        $('li#branch-control-tab-branches').removeClass('active');
+        $('li#branch-control-tab-tags').addClass('active');
+
+        $('li.branch-control-item-branch').hide();
+        $('li.branch-control-item-branch > a').removeClass('active');
+
+        $('li.branch-control-item-tag').show();
+        $('li.branch-control-item-tag > a').addClass('active');
+        $('#branch-control-input').attr('placeholder', 'Find tag ...');
+      }
+      updateBranchControlListFilter();
+    }
+
+    function updateBranchControlListFilter() {
+      const inputVal = $('#branch-control-input').val();
+      $.each($('#branch-control-input').parent().parent().find('a.active').not('.nav-item'), function(index, elem) {
+        if (!inputVal || !elem.text.trim() || elem.text.trim().toLowerCase().indexOf(inputVal.toLowerCase()) >= 0) {
+          $(elem).parent().show();
+        } else {
+          $(elem).parent().hide();
+        }
+      });
+      if ($('li#branch-control-tab-branches.active').length > 0) {
+        @if(hasWritePermission) {
+          if (inputVal) {
+            $('#create-branch').parent().find('li:last-child').show().find('.new-branch').text(inputVal);
+          } else {
+            $('#create-branch').parent().find('li:last-child').hide();
+          }
+        }
+      }
+    }
+
+    // Initialize the branch control list
+    updateBranchControlList('branches');
  });
 </script>
--- a/src/main/twirl/gitbucket/core/helper/diff.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html
@@ -8,6 +8,11 @@
  showLineNotes: Boolean)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
@import org.eclipse.jgit.diff.DiffEntry.ChangeType
+<style>
+  th.line-num {
+    cursor: pointer;
+  }
+</style>
@if(showIndex){
  <div class="pull-right" style="margin-bottom: 10px;">
    @if(oldCommitId.isEmpty && newCommitId.isDefined) {
@@ -59,7 +64,7 @@
            </div>
          }
          <span class="diffstat"><i class="octicon octicon-diff-renamed"></i></span>
-          <span class="monospace">@diff.oldPath → @diff.newPath</span>
+          <a href="#diff-@helpers.md5(diff.newPath)" id="diff-@helpers.md5(diff.newPath)" class="file-hash"><span class="strong">@diff.oldPath → @diff.newPath</span></a>
        }
        @if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){
          @if(newCommitId.isDefined){
@@ -76,7 +81,7 @@
            <i class="octicon octicon-diff-modified"></i>
          }
          </span>
-          <span class="monospace">@diff.newPath</span>
+          <a href="#diff-@helpers.md5(diff.newPath)" id="diff-@helpers.md5(diff.newPath)" class="file-hash"><span class="strong">@diff.newPath</span></a>
        }
        @if(diff.changeType == ChangeType.DELETE){
          @if(oldCommitId.isDefined){
@@ -86,7 +91,7 @@
            </div>
          }
          <span class="diffstat"><i class="octicon octicon-diff-removed"></i></span>
-          <span class="monospace">@diff.oldPath</span>
+          <a href="#diff-@helpers.md5(diff.oldPath)" id="diff-@helpers.md5(diff.oldPath)" class="file-hash"><span class="strong">@diff.oldPath</span></a>
        }
        @if(diff.oldMode != diff.newMode){
          <span class="monospace">@diff.oldMode → @diff.newMode</span>
@@ -104,8 +109,8 @@
        } else {
          @if(diff.newContent != None || diff.oldContent != None){
            <div id="diffText-@i" class="diffText"></div>
-            <input type="hidden" id="newText-@i" data-file-name="@diff.oldPath" data-val="@diff.newContent">
-            <input type="hidden" id="oldText-@i" data-file-name="@diff.newPath" data-val="@diff.oldContent">
+            <input type="hidden" id="newText-@i" data-file-name="@diff.newPath" data-val="@diff.newContent">
+            <input type="hidden" id="oldText-@i" data-file-name="@diff.oldPath" data-val="@diff.oldContent">
          } else {
            @if(diff.newIsImage || diff.oldIsImage){
              <div class="diff-image-render diff2up">
@@ -180,6 +185,10 @@ $(function(){
  }
  renderDiffs();

+  window.onhashchange = function(){
+    updateHighlighting();
+  }
+
  $('.toggle-notes').change(function() {
    if (!$(this).prop('checked')) {
      $(this).closest('table').find('.not-diff.inline-comment-form').remove();
@@ -188,7 +197,7 @@ $(function(){
  });

  $('.ignore-whitespace').change(function() {
-    renderOneDiff($(this).closest("table").find(".diffText"), window.viewType);
+    renderOneDiff($(this).closest("table").find(".diffText"), window.viewType, $(this).closest("table").find(".file-hash")[0].id);
  });

  function getInlineContainer(where) {
@@ -208,7 +217,7 @@ $(function(){

  function showCommentForm(commitId, fileName, oldLineNumber, newLineNumber, $tr){
    // assemble Ajax url
-    var url = '@helpers.url(repository)/commit/' + commitId + '/comment/_form?fileName=' + fileName@issueId.map { id => + '&issueId=@id' };
+    let url = '@helpers.url(repository)/commit/' + commitId + '/comment/_form?fileName=' + fileName@issueId.map { id => + '&issueId=@id' };
    if (!isNaN(oldLineNumber) && oldLineNumber) {
      url += ('&oldLineNumber=' + oldLineNumber)
    }
@@ -218,7 +227,7 @@ $(function(){
    // send Ajax request
    $.get(url, { dataType : 'html' }, function(responseContent) {
      // create container
-      var tmp;
+      let tmp;
      if (!isNaN(oldLineNumber) && oldLineNumber) {
        if (!isNaN(newLineNumber) && newLineNumber) {
          tmp = getInlineContainer();
@@ -240,16 +249,16 @@ $(function(){

  // Add comment button
  $('.diff-outside').on('click','table.diff .add-comment',function() {
-    var $this  = $(this);
-    var $tr    = $this.closest('tr');
-    var $check = $this.closest('table:not(.diff)').find('.toggle-notes');
+    const $this  = $(this);
+    const $tr    = $this.closest('tr');
+    const $check = $this.closest('table:not(.diff)').find('.toggle-notes');
    if (!$check.prop('checked')) {
      $check.prop('checked', true).trigger('change');
    }
    if (!$tr.nextAll(':not(.not-diff):first').prev().hasClass('inline-comment-form')) {
-      var commitId = $this.closest('.table-bordered').attr('commitId'),
-      fileName = $this.closest('.table-bordered').attr('fileName'),
-      oldLineNumber, newLineNumber;
+      const commitId = $this.closest('.table-bordered').attr('commitId'),
+      fileName = $this.closest('.table-bordered').attr('fileName');
+      let oldLineNumber, newLineNumber;
      if (window.viewType == 0) {
        oldLineNumber = $this.parent().prev('.oldline').attr('line-number');
        newLineNumber = $this.parent().prev('.newline').attr('line-number');
@@ -268,21 +277,37 @@ $(function(){

  // Reply comment
  $('.diff-outside').on('click', '.reply-comment',function(){
-    var $this = $(this);
-    var $tr    = $this.closest('tr');
-    var commitId = $this.closest('.table-bordered').attr('commitId');
-    var fileName = $this.data('filename');
-    var oldLineNumber = $this.data('oldline');
-    var newLineNumber = $this.data('newline');
+    const $this = $(this);
+    const $tr    = $this.closest('tr');
+    const commitId = $this.closest('.table-bordered').attr('commitId');
+    const fileName = $this.data('filename');
+    const oldLineNumber = $this.data('oldline');
+    const newLineNumber = $this.data('newline');

    showCommentForm(commitId, fileName, oldLineNumber, newLineNumber, $tr);
  });

+  // Line selection
+  $('.diff-outside').on('click','table.diff th.line-num',function(e) {
+    const $this   = $(this);
+    const hash    = location.hash;
+    const baseUrl = location.toString().split("#")[0];
+
+    if (e.shiftKey == true && hash.match(/#diff-\w+-L\d+(-L\d+)?/)) {
+      const fragments = hash.split('-');
+      window.history.pushState('', '', baseUrl + '#diff-' + fragments[1] + '-' + fragments[2] + '-' + $this[0].id.split('-')[2]);
+    } else {
+      window.history.pushState('', '', baseUrl + '#' + $this[0].id);
+    }
+    getSelection().empty();
+    updateHighlighting();
+  });
+
  function renderOneCommitCommentIntoDiff($v, diff){
    //var filename = $v.attr('filename');
-    var oldline  = $v.attr('oldline');
-    var newline  = $v.attr('newline');
-    var tmp;
+    const oldline = $v.attr('oldline');
+    const newline = $v.attr('newline');
+    let tmp;
    if (typeof oldline !== 'undefined') {
      if (typeof newline !== 'undefined') {
        tmp = getInlineContainer();
@@ -312,8 +337,8 @@ $(function(){
      }
      del = 5 - add;
    }
-    var ret = $('<div class="diffstat-bar">');
-    for(var i = 0; i < 5; i++){
+    const ret = $('<div class="diffstat-bar">');
+    for(let i = 0; i < 5; i++){
      if(add){
        ret.append('<span class="text-diff-added">■</span>');
        add--;
@@ -327,13 +352,13 @@ $(function(){
    return ret;
  }

-  function renderOneDiff(diffText, viewType){
-    var table = diffText.closest("table[data-diff-id]");
-    var i = table.data("diff-id");
-    var ignoreWhiteSpace = table.find('.ignore-whitespace').prop('checked');
-    diffUsingJS('oldText-' + i, 'newText-' + i, diffText.attr('id'), viewType, ignoreWhiteSpace);
-    var add = diffText.find("table").attr("add") * 1;
-    var del = diffText.find("table").attr("del") * 1;
+  function renderOneDiff(diffText, viewType, fileHash){
+    const table = diffText.closest("table[data-diff-id]");
+    const i = table.data("diff-id");
+    const ignoreWhiteSpace = table.find('.ignore-whitespace').prop('checked');
+    diffUsingJS('oldText-' + i, 'newText-' + i, diffText.attr('id'), viewType, ignoreWhiteSpace, fileHash);
+    const add = diffText.find("table").attr("add") * 1;
+    const del = diffText.find("table").attr("del") * 1;
    table.find(".diffstat").text(add + del + " ").append(renderStatBar(add, del)).attr("title", add + " additions & " + del + " deletions").tooltip();
    $('span.diffstat[data-diff-id="' + i + '"]')
        .html('<span class="text-diff-added">+' + add + '</span><span class="text-diff-deleted">-' + del + '</span>')
@@ -347,7 +372,7 @@ $(function(){
      });
    }
    @if(showLineNotes){
-      var fileName = table.attr('filename');
+      const fileName = table.attr('filename');
      $('.inline-comment').each(function(i, v) {
        if($(this).attr('filename') == fileName){
          renderOneCommitCommentIntoDiff($(this), table);
@@ -358,13 +383,13 @@ $(function(){
  }

  function renderReplyComment($table){
-    var elements = {};
-    var filename, newline, oldline;
+    const elements = {};
+    let filename, newline, oldline;
    $table.find('.comment-box-container .inline-comment').each(function(i, e){
      filename = $(e).attr('filename');
      newline = $(e).attr('newline');
      oldline = $(e).attr('oldline');
-      var key = filename + '-' + newline + '-' + oldline;
+      const key = filename + '-' + newline + '-' + oldline;
      elements[key] = {
        element: $(e),
        filename: filename,
@@ -372,18 +397,18 @@ $(function(){
        oldline: oldline
      };
    });
-    for(var key in elements){
+    for(const key in elements){
      filename = elements[key]['filename'];
      oldline = elements[key]['oldline']; //? elements[key]['oldline'] : '';
      newline = elements[key]['newline']; //? elements[key]['newline'] : '';

-      var $v = $('<div class="commit-comment-box reply-comment-box">')
+      const $v = $('<div class="commit-comment-box reply-comment-box">')
        .append($('<input type="text" class="form-control reply-comment" placeholder="Reply..." '
                       + 'data-filename="' + filename + '" '
                       + 'data-newline="' + newline + '" '
                       + 'data-oldline="' + oldline + '">'));

-      var tmp;
+      let tmp;
      if (typeof oldline !== 'undefined') {
        if (typeof newline !== 'undefined') {
          tmp = getInlineContainer();
@@ -399,16 +424,19 @@ $(function(){
    }
  }

-  function renderDiffs(){
-    var i = 0, diffs = $('.diffText');
+  function renderDiffs() {
+    const diffs = $('.diffText');
+    let i = 0;
    function render(){
-      if(diffs[i]){
-        var $table = renderOneDiff($(diffs[i]), window.viewType);
+      if (diffs[i]) {
+        const $table = renderOneDiff($(diffs[i]), window.viewType, $('.file-hash')[i].id);
        @if(hasWritePermission) {
          renderReplyComment($table);
        }
        i++;
        setTimeout(render);
+      } else {
+        updateHighlighting();
      }
    }
    render();
@@ -416,7 +444,7 @@ $(function(){
 });

 function changeDisplaySetting(key, value){
-  var url = '';
+  let url = '';
  window.params[key] = value;
  for(key in window.params){
    if(window.params[key] != ''){
@@ -429,4 +457,47 @@ function changeDisplaySetting(key, value){
  }
  location.href = url;
 }
+
+let scrolling = false;
+
+/**
+ * Highlight lines which are specified by URL hash.
+ */
+function updateHighlighting(){
+  const hash = location.hash;
+  $('tr.highlight').removeClass('highlight');
+  if (hash.match(/#diff-(\w+)-[LR]\d+(-[LR]\d+)?/)) {
+    const fragments = hash.substr(1).split('-');
+    if (fragments.length == 3) {
+      const tr = $('th#diff-' + fragments[1] + '-' + fragments[2]).closest('tr');
+      tr.addClass('highlight');
+      if(!scrolling){
+        $(window).scrollTop($('th#diff-' + fragments[1] + '-' + fragments[2]).closest('tr').offset().top);
+      }
+    } else if (fragments.length > 3) {
+      let highlight = false;
+      $('th[id^=diff-' + fragments[1] + '-').each(function(i, th) {
+        if (th.id.split('-')[2] == fragments[2]) { // start
+          highlight = true;
+          $(th.closest('tr')).addClass('highlight');
+        } else if (highlight == true) {
+          if (th.id.split('-')[2] == fragments[3]) { // end
+            $(th.closest('tr')).addClass('highlight');
+            return false;
+          } else {
+            $(th.closest('tr')).addClass('highlight');
+          }
+        }
+      });
+      if(!scrolling){
+        $(window).scrollTop($('th#diff-' + fragments[1] + '-' + fragments[2]).closest('tr').offset().top);
+      }
+    }
+  } else if (hash != ''){
+    if (!scrolling) {
+      $(window).scrollTop($(hash).offset().top);
+    }
+  }
+  scrolling = true;
+}
 </script>
--- a/src/main/twirl/gitbucket/core/issues/commentform.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/commentform.scala.html
@@ -5,7 +5,6 @@
  repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context)
@import gitbucket.core.view.helpers
@if(isEditable){
-  <hr/><br/>
  <form method="POST" validate="true" autocomplete="off">
    <div class="panel panel-default issue-comment-box">
      <div class="panel-body">
--- a/src/main/twirl/gitbucket/core/issues/commentlist.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/commentlist.scala.html
@@ -114,9 +114,26 @@
            @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
          </div>
          <div style="discussion-item-content">
-            @defining(comment.content.split(":")){ case Array(issueId, rest @ _*) => {
-              @helpers.issueLink(repository, issueId.toInt, rest.mkString(":"))
-            }}
+            @defining(comment.content.split(":")){
+              case Array(issueId, rest @ _*) => {@helpers.issueLink(repository.owner, repository.name, issueId.toInt, rest.mkString(":"))}
+            }
+          </div>
+        </div>
+      }
+      case "refer_global" => {
+        <div class="discussion-item discussion-item-refer">
+          <div class="discussion-item-header">
+            <span class="discussion-item-icon"><i class="octicon octicon-bookmark"></i></span>
+            @helpers.avatarLink(comment.commentedUserName, 16)
+            @helpers.user(comment.commentedUserName, styleClass="username strong")
+            referenced the @issueOrPullRequest()
+            @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
+          </div>
+          <div style="discussion-item-content">
+          @defining(comment.content.split(":")){
+            case Array(issueId, ownerName, repositoryName, rest @ _*) => {
+              @helpers.issueGlobalLink(ownerName, repositoryName, issueId.toInt, rest.mkString(":"))
+          }}
          </div>
        </div>
      }
--- a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
@@ -102,16 +102,16 @@
 </div>
 <div id="milestone-progress-area">
  @issue.flatMap(_.milestoneId).map { milestoneId =>
-    @milestones.collect { case (milestone, openCount, closeCount) if(milestone.milestoneId == milestoneId) => {
+    @milestones.collect { case (milestone, openCount, closeCount) if(milestone.milestoneId == milestoneId) =>
      @gitbucket.core.issues.milestones.html.progress(openCount + closeCount, closeCount)
-    }}
+    }
  }
 </div>
 <span id="label-milestone">
  @issue.flatMap(_.milestoneId).map { milestoneId =>
-    @milestones.collect { case (milestone, _, _) if(milestone.milestoneId == milestoneId) => {
+    @milestones.collect { case (milestone, _, _) if(milestone.milestoneId == milestoneId) =>
      <a class="strong small username" href="@helpers.url(repository)/issues?milestone=@helpers.urlEncode(milestone.title)&state=open">@milestone.title</a>
-    }}
+    }
  }.getOrElse {
    <span class="muted small">No milestone</span>
  }
--- a/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/conversation.scala.html
@@ -26,7 +26,7 @@
      case other => None
    }.exists(_.action == "merge")){ merged =>
      @if(!issue.closed){
-        <div class="check-conflict" style="display: none;">
+        <div class="check-conflict" style="display: none; margin-bottom: 20px;">
          <div class="issue-comment-box" style="background-color: #fbeed5">
            <div class="box-content" style="border: 1px solid #c09853; padding: 10px;">
              <img src="@helpers.assets("/common/images/indicator.gif")"/> Checking...
@@ -55,13 +55,13 @@
  <script>
  $(function(){
    @if(commits.nonEmpty){
-      var checkConflict = $('.check-conflict').show();
+      const checkConflict = $('.check-conflict').show();
      if(checkConflict.length){
        $.get('@helpers.url(repository)/pull/@issue.issueId/mergeguide', function(data){ $('.check-conflict').html(data); });
      }
    }
    $('.delete-branch').click(function(e){
-      var branchName = $(e.target).data('name');
+      const branchName = $(e.target).data('name');
      return confirm('Are you sure you want to remove the ' + branchName + ' branch?');
    });
  });
--- a/src/main/twirl/gitbucket/core/releases/form.scala.html
+++ b/src/main/twirl/gitbucket/core/releases/form.scala.html
@@ -44,7 +44,7 @@
            @release.map { case (release, assets) =>
              @assets.map { asset =>
                <li>
-                  <a href="@context.baseUrl/@repository.owner/@repository.name/_release/@helpers.encodeRefName(tag.name)/@asset.fileName"><i class="octicon octicon-file"></i>@asset.label</a>
+                  <a href="@context.baseUrl/@repository.owner/@repository.name/_release/@helpers.urlEncode(tag.name)/@asset.fileName"><i class="octicon octicon-file"></i>@asset.label</a>
                  <a href="#" class="remove pull-right" style="padding-top: 0px;">(remove)</a>
                  <input type="hidden" name="file:@asset.fileName" value="@asset.label"/>
                </li>
@@ -56,9 +56,9 @@
          </div>
          <div class="align-right" style="margin-top: 12px;">
            @if(release.isEmpty){
-              <input type="submit" class="btn btn-success" value="Submit new release" formaction="@helpers.url(repository)/releases/@helpers.encodeRefName(tag.name)/create"/>
+              <input type="submit" class="btn btn-success" value="Submit new release" formaction="@helpers.url(repository)/releases/@helpers.urlEncode(tag.name)/create"/>
            } else {
-              <input type="submit" class="btn btn-success" value="Update release" formaction="@helpers.url(repository)/releases/@helpers.encodeRefName(tag.name)/edit"/>
+              <input type="submit" class="btn btn-success" value="Update release" formaction="@helpers.url(repository)/releases/@helpers.urlEncode(tag.name)/edit"/>
            }
          </div>
        </div>
--- a/src/main/twirl/gitbucket/core/releases/list.scala.html
+++ b/src/main/twirl/gitbucket/core/releases/list.scala.html
@@ -15,14 +15,14 @@
        <tr>
          <td>
            <div class="col-md-2 text-right">
-              <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(tag.name)" class="strong"><i class="octicon octicon-tag"></i>@tag.name</a><br>
+              <a href="@helpers.url(repository)/tree/@helpers.urlEncode(tag.name)" class="strong"><i class="octicon octicon-tag"></i>@tag.name</a><br>
              <a href="@helpers.url(repository)/commit/@tag.id" class="monospace muted"><i class="octicon octicon-git-commit"></i>@tag.id.substring(0, 7)</a><br>
              <span class="muted">@gitbucket.core.helper.html.datetimeago(tag.time)</span>
            </div>
            <div class="col-md-10" style="border-left: 1px solid #eee">
              <div class="release-note markdown-body">
                @release.map { case (release, assets) =>
-                  <h3><a href="@helpers.url(repository)/releases/@release.tag">@release.name</a></h3>
+                  <h3><a href="@helpers.url(repository)/releases/@helpers.urlEncode(release.tag)">@release.name</a></h3>
                  <p class="muted">
                    @helpers.avatarLink(release.author, 20) @helpers.user(release.author, styleClass="username") released this @gitbucket.core.helper.html.datetimeago(release.registeredDate)
                  </p>
--- a/src/main/twirl/gitbucket/core/releases/release.scala.html
+++ b/src/main/twirl/gitbucket/core/releases/release.scala.html
@@ -9,7 +9,7 @@
      <div class="col-md-2 text-right">
        @defining(repository.tags.find(_.name == release.tag)){ tag =>
          @tag.map { tag =>
-            <a href="@helpers.url(repository)/tree/@helpers.encodeRefName(tag.name)" class="strong"><i class="octicon octicon-tag"></i>@tag.name</a><br>
+            <a href="@helpers.url(repository)/tree/@helpers.urlEncode(tag.name)" class="strong"><i class="octicon octicon-tag"></i>@tag.name</a><br>
            <a href="@helpers.url(repository)/commit/@tag.id" class="monospace muted"><i class="octicon octicon-git-commit"></i>@tag.id.substring(0, 7)</a><br>
            <span class="muted">@gitbucket.core.helper.html.datetimeago(tag.time)</span>
          }
--- a/src/main/twirl/gitbucket/core/repo/blob.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html
@@ -106,17 +106,15 @@
 }
 <script>
 $(window).on('load', function(){
-  updateHighlighting();
-
  window.onhashchange = function(){
    updateHighlighting();
  }

-  var pre = $('pre.prettyprint');
-  function updateSourceLineNum(){
+  const pre = $('pre.prettyprint');
+  function updateSourceLineNum() {
    $('.source-line-num').remove();
-    var pos = pre.find('ol.linenums').position();
-    if(pos){
+    const pos = pre.find('ol.linenums').position();
+    if (pos) {
      $('<div class="source-line-num">').css({
        height  : pre.height(),
        width   : '48px',
@@ -125,34 +123,40 @@ $(window).on('load', function(){
        top     : pos.top + 'px',
        left    : pos.left + 'px'
      }).click(function(e){
-        var pos = $(this).data("pos");
-        if(!pos){
+        let pos = $(this).data("pos");
+        if (!pos) {
          pos = $('ol.linenums li').map(function(){ return { id: $(this).attr("id"), top: $(this).position().top} }).toArray();
          $(this).data("pos",pos);
        }
-        for(var i = 0; i < pos.length-1; i++){
+        let i = 0;
+        for(i = 0; i < pos.length - 1; i++){
          if(pos[i + 1].top > e.pageY){
            break;
          }
        }
-        var line = pos[i].id.replace(/^L/,'');
-        var hash = location.hash;
-        var commitUrl = '@helpers.url(repository)/blob/@helpers.encodeRefName((latestCommit.id :: pathList).mkString("/"))';
-        if(e.shiftKey == true && hash.match(/#L\d+(-L\d+)?/)){
-          var lines = hash.split('-');
-          window.history.pushState('', '', commitUrl + lines[0] + '-L' + line);
+        const line    = pos[i].id.replace(/^L/,'');
+        const hash    = location.hash;
+        const baseUrl = location.toString().split("#")[0];
+        if (e.shiftKey == true && hash.match(/#L\d+(-L\d+)?/)) {
+          const fragments = hash.split('-');
+          window.history.pushState('', '', baseUrl + fragments[0] + '-L' + line);
        } else {
-          var p = $("#L"+line).attr('id',"");
-          window.history.pushState('', '', commitUrl + '#L' + line);
-          p.attr('id','L'+line);
+          const p = $("#L" + line).attr('id', '');
+          window.history.pushState('', '', baseUrl + '#L' + line);
+          p.attr('id','L' + line);
        }
        $("#branchCtrlWrapper .btn .muted").text("tree:");
        $("#branchCtrlWrapper .btn .strong").text("@latestCommit.id.substring(0, 10)");
+        getSelection().empty();
        updateHighlighting();
      }).appendTo(pre);
+      updateHighlighting();
+    } else {
+      // Maybe code view is not initialized yet. Retry until succeed.
+      setTimeout(updateSourceLineNum, 300);
    }
  }
-  var repository = $('.blame-action').data('repository');
+  const repository = $('.blame-action').data('repository');
  $('.blame-action').click(function(e){
    if(history.pushState && $('pre.prettyprint.no-renderable').length){
      e.preventDefault();
@@ -162,44 +166,45 @@ $(window).on('load', function(){
  });

  function updateBlame(){
-    var m = /\/(blame|blob)(\/.*)$/.exec(location.href);
-    var mode = m[1];
+    const m = /\/(blame|blob)(\/.*)$/.exec(location.href);
+    const mode = m[1];
    $('.blame-action').toggleClass("active", mode=='blame').attr('href', repository + (m[1] == 'blame' ? '/blob' : '/blame') + m[2]);
    if(pre.parents("div.box-content-bottom").find(".blame").length){
      pre.parent().toggleClass("blame-container", mode == 'blame');
      updateSourceLineNum();
      return;
    }
-    if(mode=='blob'){
+    if(mode == 'blob'){
      updateSourceLineNum();
      return;
    }
    $(document.body).toggleClass('no-box-shadow', document.body.style.boxShadow === undefined);
    $('.blame-action').addClass("active");
-    var base = $('<div class="blame">').css({height: pre.height()}).prependTo(pre.parents("div.box-content-bottom"));
+    const base = $('<div class="blame">').css({height: pre.height()}).prependTo(pre.parents("div.box-content-bottom"));
    base.parent().addClass("blame-container");
    updateSourceLineNum();
    $.get($('.blame-action').data('url')).done(function(data){
-      var blame = data.blame;
-      var index = [];
-      for(var i = 0; i < blame.length; i++){
-        for(var j = 0; j < blame[i].lines.length; j++){
+      let blame = data.blame;
+      let lastDiv;
+      const now = new Date().getTime();
+      const index = [];
+      for(let i = 0; i < blame.length; i++){
+        for(let j = 0; j < blame[i].lines.length; j++){
          index[blame[i].lines[j]] = blame[i];
        }
      }
-      var blame, lastDiv, now = new Date().getTime();

      $('pre.prettyprint ol.linenums li').each(function(i, e){
-        var p = $(e).position();
-        var h = $(e).height();
+        const p = $(e).position();
+        const h = $(e).height();
        if(blame == index[i]){
          lastDiv.css("min-height",(p.top + h + 1) - lastDiv.position().top);
        } else {
          $(e).addClass('blame-sep')
          blame = index[i];
-          var sha = $('<div class="blame-sha">')
-             .append($('<a>').attr("href", data.root + '/commit/' + blame.id).text(blame.id.substr(0,7)));
-          if(blame.prev){
+          const sha = $('<div class="blame-sha">')
+             .append($('<a>').attr("href", data.root + '/commit/' + blame.id).text(blame.id.substr(0, 7)));
+          if (blame.prev) {
             sha.append($('<br />'))
             .append($('<a class="muted-link">').text('prev').attr("href", data.root + '/blame/' + blame.prev + '/' + (blame.prevPath || data.path)));
          }
@@ -221,51 +226,53 @@ $(window).on('load', function(){
    });
    return false;
  };
+
  $(document).on('expanded.pushMenu collapsed.pushMenu', function(e){
    setTimeout(updateBlame, 300);
  });
+
  updateBlame();
 });

-var scrolling = false;
+let scrolling = false;

 /**
- * Hightlight lines which are specified by URL hash.
+ * Highlight lines which are specified by URL hash.
 */
-function updateHighlighting(){
-  var hash = location.hash;
-  var isDark = @{highlighterTheme.contains("dark").toString};
-  if(hash.match(/#L\d+(-L\d+)?/)){
-    if(isDark){
+function updateHighlighting() {
+  const hash = location.hash;
+  const isDark = @{highlighterTheme.contains("dark").toString};
+  if (hash.match(/#L\d+(-L\d+)?/)) {
+    if (isDark) {
      $('li.highlight').removeClass('highlight-dark');
-    }else{
+    } else {
      $('li.highlight').removeClass('highlight');
    }
-    var lines = hash.substr(1).split('-');
-    if(lines.length == 1){
-      if(isDark){
-        $('#' + lines[0]).addClass('highlight-dark');
-      }else{
-        $('#' + lines[0]).addClass('highlight');
+    const fragments = hash.substr(1).split('-');
+    if (fragments.length == 1) {
+      if (isDark) {
+        $('#' + fragments[0]).addClass('highlight-dark');
+      } else {
+        $('#' + fragments[0]).addClass('highlight');
      }
      if(!scrolling){
-        $(window).scrollTop($('#' + lines[0]).offset().top - 40);
+        $(window).scrollTop($('#' + fragments[0]).offset().top);
      }
-    } else if(lines.length > 1){
-      var start = parseInt(lines[0].substr(1));
-      var end   = parseInt(lines[1].substr(1));
-      for(var i = start; i <= end; i++){
-        if(isDark){
+    } else if(fragments.length > 1){
+      const start = parseInt(fragments[0].substr(1));
+      const end   = parseInt(fragments[1].substr(1));
+      for (let i = start; i <= end; i++) {
+        if (isDark) {
          $('#L' + i).addClass('highlight-dark');
-        }else{
+        } else {
          $('#L' + i).addClass('highlight');
        }
      }
-      if(!scrolling){
-        $(window).scrollTop($('#L' + start).offset().top - 40);
+      if (!scrolling) {
+        $(window).scrollTop($('#' + fragments[0]).offset().top);
      }
    }
-    scrolling = true;
  }
+  scrolling = true;
 }
 </script>
--- a/src/main/twirl/gitbucket/core/repo/files.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/files.scala.html
@@ -80,7 +80,10 @@
      <div class="pull-left">
        @gitbucket.core.helper.html.branchcontrol(branch, repository, hasWritePermission){
          @repository.branchList.map { x =>
-            <li><a href="@helpers.url(repository)/tree/@helpers.encodeRefName(x)">@gitbucket.core.helper.html.checkicon(x == branch) @x</a></li>
+            <li class="branch-control-item-branch"><a href="@helpers.url(repository)/tree/@helpers.encodeRefName(x)">@gitbucket.core.helper.html.checkicon(x == branch) @x</a></li>
+          }
+          @repository.tags.map { x =>
+            <li class="branch-control-item-tag"><a href="@helpers.url(repository)/tree/@helpers.encodeRefName(x.name)">@gitbucket.core.helper.html.checkicon(x.name == branch) @x.name</a></li>
          }
        }
        @if(pathList.nonEmpty){
--- a/src/main/twirl/gitbucket/core/settings/edithookform.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/edithookform.scala.html
@@ -96,7 +96,7 @@
        <div id="test-report" style="display:none">
          <ul class="nav nav-tabs" id="test-report-tab">
            <li class="active"><a href="#request">Request</a></li>
-            <li><a href="#response">Response <span class="badge badge-success" id="res-status"></span></a></li>
+            <li><a href="#response">Response <span class="label label-success" id="res-status"></span></a></li>
          </ul>
          <div class="tab-content">
            <div class="tab-pane active" id="request">
@@ -137,9 +137,9 @@ $(function(){
    e.stopPropagation();
    e.stopImmediatePropagation();
    e.preventDefault();
-    var url = this.form.url.value;
-    var token = this.form.token.value;
-    var ctype = this.form.ctype.value;
+    const url = this.form.url.value;
+    const token = this.form.token.value;
+    const ctype = this.form.ctype.value;
    if(!/^https?:\/\/.+/.test(url)){
      alert("invalid url");
      return;
@@ -147,19 +147,18 @@ $(function(){
    $("#test-modal-url").text(url)
    $("#test-report-modal").modal('show')
    $("#test-report").hide();
-    var targetUrl = '@testButtonUrl?url=' + encodeURIComponent(url) + '&ctype=' + ctype + '&token=';
+    let targetUrl = '@testButtonUrl?url=' + encodeURIComponent(url) + '&ctype=' + ctype + '&token=';
    if (token) {
      targetUrl = targetUrl + encodeURIComponent(token);
    }
    $.ajax({
-      method:'POST',
-      url:targetUrl,
+      method: 'POST',
+      url: targetUrl,
      success: function(e){
-        //console.log(e);
        $('#test-report-tab a:first').tab('show');
        $("#test-report").show();
-        $("#req-success").toggle(e.request&&!e.request.error);
-        $("#req-errors").toggle(e.request&&!!e.request.error);
+        $("#req-success").toggle(e.request && !e.request.error);
+        $("#req-errors").toggle(e.request && !!e.request.error);
        $("#req-errors-body").text(e.request.error);
        function headers(h){
          h = h["headers"];
@@ -172,9 +171,9 @@ $(function(){
        $("#res-success").toggle(e.response && !e.response.error);
        $("#res-errors").toggle(e.response && !!e.response.error);
        $("#res-errors-body").text(e.response.error);
-        var success = !!(e.response && e.response.status && /^2\d\d$/.test(e.response.status.statusCode));
-        $("#res-status").text((e.response && e.response.status && e.response.status.statusCode) || "ERROR");
-        $("#res-status").toggleClass("badge-success", success).toggleClass("badge-important", !success);
+        const success = !!(e.response && e.response.status && /^2\d\d$/.test(e.response.status));
+        $("#res-status").text((e.response && e.response.status) || "ERROR");
+        $("#res-status").toggleClass("label-success", success).toggleClass("label-danger", !success);
        $("#res-headers").html(headers(e.response));
        $("#res-body").text(e.response && e.response.body ? e.response.body : "");
      },
--- a/src/main/twirl/gitbucket/core/settings/options.scala.html
+++ b/src/main/twirl/gitbucket/core/settings/options.scala.html
@@ -33,8 +33,6 @@
                  You choose who can see and commit to this repository.
                </div>
              </label>
-            </fieldset>
-            <fieldset class="form-group">
              <label class="checkbox" for="allowFork">
                <input type="checkbox" id="allowFork" name="allowFork"@if(repository.repository.options.allowFork){ checked}/>
                Forks<br>
@@ -42,6 +40,13 @@
                  Allow users who can access this repository to fork it.
                </div>
              </label>
+              <label class="checkbox" for="safeMode">
+                <input type="checkbox" id="safeMode" name="safeMode"@if(repository.repository.options.safeMode){ checked}/>
+                XSS protection<br>
+                <div class="normal muted">
+                  Render any images in the repository viewer. Don't disable this option in the public environment.
+                </div>
+              </label>
            </fieldset>
          </div>
        </div>
@@ -138,11 +143,13 @@
              }
              <fieldset class="form-group">
                <label for="defaultMergeOption">Default merge strategy</label>
-                <select name="defaultMergeOption" id="defaultMergeOption">
-                  <option value="merge-commit">Merge commit</option>
-                  <option value="squash">Squash</option>
-                  <option value="rebase">Rebase</option>
-                </select>
+                @defining(repository.repository.options.defaultMergeOption) { defaultMergeOption =>
+                  <select name="defaultMergeOption" id="defaultMergeOption">
+                    <option value="merge-commit" @if(defaultMergeOption == "merge-commit"){selected}>Merge commit</option>
+                    <option value="squash" @if(defaultMergeOption == "squash"){selected}>Squash</option>
+                    <option value="rebase" @if(defaultMergeOption == "rebase"){selected}>Rebase</option>
+                  </select>
+                }
                <span id="error-defaultMergeOption" class="error"></span>
              </fieldset>
            </fieldset>
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -292,6 +292,7 @@ div.box-content-bottom img {

 table.table th.box-header {
  background-color: #f5f5f5;
+  padding: 2px;
 }

 th.box-header .octicon {
@@ -604,8 +605,11 @@ div.markdown-body pre.plain {
  padding: 20px;
 }

-li.highlight {
+li.highlight,
+table.diff tr.highlight>th.delete, table.diff tr.highlight>th.insert, table.diff tr.highlight>th.equal,
+table.diff tr.highlight>td.delete, table.diff tr.highlight>td.insert, table.diff tr.highlight>td.equal {
  background-color: #ffb;
+  !important
 }

 li.highlight-dark {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Naoki Takezoe	cb9f56fc22	Release GitBucket 4.36.0	2021-07-17 17:26:18 +09:00
kenji yoshida	719a521f06	Update build.yml	2021-07-17 13:00:44 +09:00
Scala Steward	413754976f	Update oauth2-oidc-sdk to 9.10.1	2021-07-15 23:22:47 +09:00
Scala Steward	4530cfc068	Update commons-io to 2.11.0	2021-07-13 23:11:16 +09:00
Scala Steward	fcc7d6da2d	Update commons-compress to 1.21	2021-07-13 07:51:46 +09:00
Scala Steward	33e565d029	Update sbt to 1.5.5	2021-07-12 23:08:02 +09:00
Naoki Takezoe	6a1da37e9a	Ignore submodules in repository archive downloading (#2817 )	2021-07-11 16:55:44 +09:00
Naoki Takezoe	897cc5eea4	Support tags in the branch selector (#2811 )	2021-07-11 16:05:41 +09:00
Naoki Takezoe	5cbea281af	Add new option to disable XSS protection in image rendering (#2806 )	2021-07-10 12:51:25 +09:00
Scala Steward	e74db57b75	Update sbt-scalafmt to 2.4.3	2021-07-09 09:08:26 +09:00
Scala Steward	6b2d124d09	Update jetty-continuation, jetty-http, ... to 9.4.43.v20210629	2021-07-07 11:07:23 +09:00
Scala Steward	7b3c77db8c	Update tika-core to 1.27	2021-07-07 07:12:36 +09:00
Scala Steward	1bcab5c2c7	Update postgresql to 42.2.23	2021-07-07 07:11:43 +09:00
Scala Steward	16020e9a7d	Update oauth2-oidc-sdk to 9.9.1	2021-07-03 20:05:42 +09:00
Naoki Takezoe	dfd3e22986	Handle slash contained tag name correctly in releases (#2805 )	2021-06-27 03:32:18 +09:00
Naoki Takezoe	48d7a20fb7	Keep default merge strategy selection (#2804 )	2021-06-27 02:40:17 +09:00
Scala Steward	04108a0a1a	Update mockito-core to 3.11.2	2021-06-22 06:16:55 +09:00
Naoki Takezoe	e0bab59846	Fix Repository Contents API issues (#2802 )	2021-06-21 00:55:03 +09:00
Naoki Takezoe	1004c83bc4	Drop the use of SyntaxSugars.defining from codebase (#2800 )	2021-06-20 09:48:50 +09:00
ShalokShalom	502bb450e3	correct typo (#2801 ) Gitter is a name, and since that capitalized	2021-06-20 02:32:21 +09:00
Scala Steward	fb03b0bec7	Update postgresql to 42.2.22	2021-06-17 06:21:51 +09:00
Scala Steward	2c3a1c9c92	Update github-api to 1.131	2021-06-16 08:54:24 +09:00
Scala Steward	73b7ee2d57	Update sbt to 1.5.4	2021-06-14 19:50:44 +09:00
Scala Steward	71df890f39	Update commons-io to 2.10.0	2021-06-14 07:09:47 +09:00
Scala Steward	1fdac404b1	Update mockito-core to 3.11.1	2021-06-12 01:12:18 +09:00
Scala Steward	47be1e60bb	Update postgresql to 42.2.21	2021-06-11 07:53:15 +09:00
Scala Steward	1c05f50954	Update jetty-continuation, jetty-http, ... to 9.4.42.v20210604	2021-06-09 09:10:08 +09:00
Scala Steward	ce26a48fd7	Update org.eclipse.jgit.archive, ... to 5.12.0.202106070339-r	2021-06-08 06:53:34 +09:00
Scala Steward	26e0838ae0	Update oauth2-oidc-sdk to 9.9	2021-06-07 21:08:37 +09:00
xuwei-k	6b5b0db20a	avoid `enum` prepare Scala 3	2021-06-07 20:19:57 +09:00
xuwei-k	5973c8cb85	prepare Scala 3	2021-06-07 20:16:18 +09:00
Scala Steward	f683439c73	Update sbt-assembly to 1.0.0	2021-06-07 19:24:14 +09:00
xuwei-k	625f3655ec	prepare Scala 3	2021-06-07 17:35:14 +09:00
Scala Steward	4a5ab1ae71	Update oauth2-oidc-sdk to 9.8.1	2021-06-05 19:25:06 +09:00
kenji yoshida	3bcae2c6d2	Create CODEOWNERS	2021-06-04 11:54:06 +09:00
Scala Steward	4441eff657	Update sbt to 1.5.3	2021-06-04 11:51:42 +09:00
Scala Steward	9fed83e222	Update oauth2-oidc-sdk to 9.8	2021-06-04 11:51:33 +09:00
Scala Steward	42ea9bac65	Update github-api to 1.130	2021-06-04 11:51:27 +09:00
Scala Steward	2aba827772	Update mockito-core to 3.11.0	2021-06-04 11:51:23 +09:00
dependabot[bot]	31e84bd543	Bump actions/cache from 2.1.5 to 2.1.6 Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2.1.5...v2.1.6) Signed-off-by: dependabot[bot] <support@github.com>	2021-06-04 11:51:11 +09:00
Scala Steward	ba471b8bf7	Update sbt-scoverage to 1.8.2 (#2780 )	2021-05-30 08:46:40 +09:00
Scala Steward	90ec95494d	Update commons-io to 2.9.0 (#2778 )	2021-05-26 16:22:49 +09:00
Scala Steward	e72dbad765	Update testcontainers-scala to 0.39.5 (#2777 )	2021-05-26 16:22:35 +09:00
Scala Steward	ed63ea4674	Update github-api to 1.129 (#2776 )	2021-05-26 16:22:25 +09:00
Scala Steward	559a52404f	Update oauth2-oidc-sdk to 9.7	2021-05-23 09:41:40 +09:00
Scala Steward	5e80848524	Update oauth2-oidc-sdk to 9.5.3	2021-05-22 21:24:38 +09:00
Scala Steward	055a4f0798	Update oauth2-oidc-sdk to 9.5.2 (#2771 )	2021-05-21 02:32:29 +09:00
Scala Steward	6f432e537c	Update sbt-scoverage to 1.8.1 (#2772 )	2021-05-21 02:32:11 +09:00
Scala Steward	a2abbbbd63	Update scala-library to 2.13.6	2021-05-18 11:53:45 +09:00
Scala Steward	16707b99e6	Update jetty-continuation, jetty-http, ... to 9.4.41.v20210516	2021-05-18 11:53:36 +09:00
Scala Steward	80a4ed62cc	Update org.eclipse.jgit.archive, ... to 5.11.1.202105131744-r	2021-05-17 07:06:13 +09:00
Scala Steward	b713a334f0	Update mariadb-java-client to 2.7.3	2021-05-14 06:45:53 +09:00
Scala Steward	ec6264c04c	Update testcontainers-scala to 0.39.4 (#2765 ) Co-authored-by: Naoki Takezoe <takezoe@gmail.com>	2021-05-14 06:45:33 +09:00
Scala Steward	44bb1ab565	Update mockito-core to 3.10.0 (#2766 )	2021-05-13 02:35:27 +09:00
Scala Steward	523ee025ac	Update sbt-scoverage to 1.8.0 (#2764 )	2021-05-11 23:13:31 +09:00
Scala Steward	d193c6399c	Update sbt-scoverage to 1.7.3	2021-05-11 12:16:17 +09:00
Scala Steward	8c9715f4d9	Update oauth2-oidc-sdk to 9.5.1	2021-05-11 12:16:13 +09:00
Scala Steward	3bbdcd5f14	Update sbt to 1.5.2	2021-05-11 12:16:05 +09:00
Scala Steward	c183d3b0b5	Update sbt-scoverage to 1.7.2 (#2759 )	2021-05-03 20:10:28 +09:00
Scala Steward	b6f0c6bf57	Update oauth2-oidc-sdk to 9.5	2021-05-02 15:08:38 +09:00
Scala Steward	8719e834f3	Update java-diff-utils to 4.10 (#2754 )	2021-04-29 10:21:10 +09:00
Scala Steward	f23b8c6d61	Update sbt-scoverage to 1.7.0 (#2753 )	2021-04-29 10:21:00 +09:00
Scala Steward	d46be31ea8	Update oauth2-oidc-sdk to 9.4.1	2021-04-27 06:53:40 +09:00
Scala Steward	9bb36e4cb2	Update sbt to 1.5.1	2021-04-27 06:53:29 +09:00
Scala Steward	2780fb9605	Update oauth2-oidc-sdk to 9.4	2021-04-23 08:58:10 +09:00
Scala Steward	b69e2d299a	Update github-api to 1.128	2021-04-23 08:57:45 +09:00
Scala Steward	a07bd7b1a4	Update postgresql to 42.2.20	2021-04-23 08:57:33 +09:00
dependabot[bot]	d605455678	Bump actions/cache from v2.1.4 to v2.1.5 Bumps [actions/cache](https://github.com/actions/cache) from v2.1.4 to v2.1.5. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2.1.4...1a9e2138d905efd099035b49d8b7a3888c653ca8) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-20 12:31:14 +09:00
Naoki Takezoe	781b1169a2	Use account name as pusher for commits by WebUI (#2745 )	2021-04-17 13:08:42 +09:00
Scala Steward	80112d3437	Update mysql, postgresql to 1.15.3	2021-04-17 12:42:41 +09:00
Scala Steward	131af7f4fa	Update jetty-continuation, jetty-http, ... to 9.4.40.v20210413	2021-04-17 12:42:15 +09:00
Naoki Takezoe	1ceac4ef9f	Minor fix for WebHook testing UI (#2744 )	2021-04-17 12:40:14 +09:00
Jesse Gorzinski	b7aa3e69f4	(bugfix) password msg when editing an LDAP profile (#2732 )	2021-04-15 16:55:46 +09:00
Scala Steward	62231c41b2	Update oauth2-oidc-sdk to 9.3.3	2021-04-14 19:07:45 +09:00
dependabot[bot]	6c0a33712b	Bump actions/setup-java from v1 to v2 (#2736 ) Bumps [actions/setup-java](https://github.com/actions/setup-java) from v1 to v2. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v1...8764a52df183aa0ccea74521dfd9d506ffc7a19a) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: kenji yoshida <6b656e6a69@gmail.com>	2021-04-14 09:50:22 +00:00
Scala Steward	e192624489	Update github-api to 1.127 (#2735 )	2021-04-10 12:34:09 +09:00
Scala Steward	68609e44de	Update mockito-core to 3.9.0 (#2733 )	2021-04-08 11:36:47 +09:00
Naoki Takezoe	c8e3af6072	Abolish the pull request title length limitation (#2731 )	2021-04-07 12:49:58 +09:00
Naoki Takezoe	9f7048a19c	Eliminate context.loginAccount.get() by adding context.withLoginAccount() (#2729 )	2021-04-07 12:19:47 +09:00
Scala Steward	cbdc0528ca	Update sbt to 1.5.0	2021-04-06 13:22:29 +09:00
Naoki Takezoe	444facc95b	Drop unused syntax sugars (#2728 )	2021-04-05 09:54:56 +09:00
Naoki Takezoe	ed40ddaa45	Remove unused import statements (#2726 )	2021-04-04 23:35:22 +09:00
Naoki Takezoe	43c629b3e5	Fix repository creation permission check (#2725 )	2021-04-04 10:22:34 +09:00
onukura	0d2c156579	Add function to refer issue/PR of other repositories within issue/PR conversations (#2608 )	2021-04-03 11:14:36 +09:00
Scala Steward	ab218f8540	Update tika-core to 1.26	2021-03-30 14:51:43 +09:00
Scala Steward	4b8a375890	Update oauth2-oidc-sdk to 9.3	2021-03-30 14:51:34 +09:00
Scala Steward	9c3a5f3f0a	Update jetty-continuation, jetty-http, ... to 9.4.39.v20210325	2021-03-30 14:51:19 +09:00
Scala Steward	1bcfbec29c	Update oauth2-oidc-sdk to 9.2.4	2021-03-26 12:35:23 +09:00
Scala Steward	781940436a	Update github-api to 1.125 (#2717 )	2021-03-26 12:09:23 +09:00
kaz-on	7f226a6ab1	Fixed file names passed to syntax highlighter in diff view (#2716 )	2021-03-25 07:45:35 +09:00
Shreejan Shrestha	f538950d64	Solve repository deletion error on Windows (#2711 ) - Added function to delete given folder recursively. - Used the function for deleting the folder, while deleting repository. fixes #2628	2021-03-23 09:06:38 +09:00
Naoki Takezoe	142be65893	Revert workaround for timestamp issue in war file creation (#2714 )	2021-03-23 08:56:33 +09:00
Scala Steward	8b01e5bc1f	Update github-api to 1.124	2021-03-21 11:08:42 +09:00
Scala Steward	bde0aab207	Update oauth2-oidc-sdk to 9.2.3	2021-03-21 11:08:27 +09:00
Scala Steward	31ecfef1c9	Update sbt-twirl to 1.5.1	2021-03-21 11:07:36 +09:00
Scala Steward	0fdae4c334	Update org.eclipse.jgit.archive, ... to 5.11.0.202103091610-r	2021-03-16 20:13:23 +09:00
xuwei-k	3ea7de974b	add explicit types for implicit val prepare Scala 3	2021-03-14 10:53:50 +09:00
kenji yoshida	34a7990d1d	use slash syntax	2021-03-14 10:32:58 +09:00
Scala Steward	709d759d09	Update thumbnailator to 0.4.14	2021-03-14 08:10:51 +09:00
Scala Steward	2d47252b27	Update sbt to 1.4.9	2021-03-14 08:08:45 +09:00
xuwei-k	8586e141fc	avoid do-while prepare Scala 3 https://dotty.epfl.ch/docs/reference/dropped-features/do-while.html	2021-03-10 12:10:30 +09:00
Scala Steward	e3887e6872	Update sbt to 1.4.8	2021-03-10 11:54:48 +09:00
Scala Steward	fd658c35ee	Update oauth2-oidc-sdk to 9.2.2	2021-03-07 13:19:34 +09:00
Scala Steward	ca4c1b237f	Update HikariCP to 4.0.3	2021-03-07 13:19:00 +09:00
Scala Steward	92b17fd719	Update json4s-jackson to 3.6.11 (#2699 )	2021-03-03 15:49:19 +09:00
Naoki Takezoe	b4453531a3	Update auto_update.md	2021-03-02 20:58:58 +09:00
Naoki Takezoe	de72a9223f	Update build.md	2021-03-02 20:48:58 +09:00
Scala Steward	ae26e3031e	Update jetty-continuation, jetty-http, ... to 9.4.38.v20210224	2021-02-27 13:15:35 +09:00
Scala Steward	c26b41cfc2	Update github-api to 1.123	2021-02-27 13:15:15 +09:00
Scala Steward	2c4ee664ab	Update oauth2-oidc-sdk to 9.2.1	2021-02-26 19:16:36 +09:00
kenji yoshida	911cd45965	ignore jetty 11.x and 10.x updates	2021-02-26 07:19:51 +09:00
Scala Steward	320cc58c62	Update testcontainers-scala to 0.39.3 (#2695 )	2021-02-25 17:58:01 +09:00
ziggystar	cfa1638e3c	Update README.md (#2694 ) ## Developer information is hard to find I've been looking for instructions on how to build gitbucket a couple of times, and I've never found them until takzoe pointed me towards `doc/build.md`. After knowing about this, I read through the readme once again, looking for such a link, and then I've found it as the last sentence within a section named `Features`. What I've been looking for: - either a file named `INSTALL.md`, `BUILD.md` in `/` - or a section (or a link) in the main readme I've put the link to `doc/readme.md` into a separate section "Building and Development" and added a short summary. I'm not so sure about the order of the new section and "Plugins".	2021-02-25 06:53:09 +09:00
Scala Steward	27264bf59a	Update testcontainers-scala to 0.39.2 (#2693 )	2021-02-24 23:25:22 +09:00
Scala Steward	935283272e	Update scala-library to 2.13.5	2021-02-23 17:00:52 +09:00
Scala Steward	ea440294b1	Update oauth2-oidc-sdk to 9.2	2021-02-23 10:32:29 +09:00
Scala Steward	df8435bf6a	Update jetty-continuation, jetty-http, ... to 9.4.37.v20210219	2021-02-23 10:31:29 +09:00
Scala Steward	4fe019b11f	Update mockito-core to 3.8.0	2021-02-23 10:31:12 +09:00
kenji yoshida	538c79705a	updates.includeScala = true	2021-02-23 10:26:50 +09:00
onukura	e94d972741	Add create and push webhooks call for branch creation via GUI. (#2624 )	2021-02-22 03:38:43 +09:00
Naoki Takezoe	c58a9aca6a	Links to files and lines in the diff view (#2685 )	2021-02-21 23:33:53 +09:00
solsticesurfer	a6612e8522	Prevent execution of empty SQL strings during database import (#2664 ) Co-authored-by: Naoki Takezoe <takezoe@gmail.com>	2021-02-21 17:10:06 +09:00
Naoki Takezoe	bd455b9a0a	Update authenticator.md	2021-02-21 14:06:04 +09:00
Naoki Takezoe	122853f1f6	Fix issue / pull request view templates (#2684 )	2021-02-21 08:06:11 +09:00
Naoki Takezoe	debbc21bf3	Upgrade java-diff-utils (#2678 )	2021-02-20 18:27:15 +09:00
Scala Steward	d991fdcbd9	Update postgresql to 42.2.19 (#2682 )	2021-02-20 17:44:35 +09:00
Scala Steward	78cc8f14fd	Update commons-net to 3.8.0 (#2683 )	2021-02-20 17:44:23 +09:00
Naoki Takezoe	09f1a06267	Update authenticator.md	2021-02-20 17:41:50 +09:00
Naoki Takezoe	6fb910a939	Update authenticator.md	2021-02-20 17:41:13 +09:00
Naoki Takezoe	9e891a0168	Fix typo	2021-02-20 17:40:30 +09:00
Naoki Takezoe	0bc77ce453	Fix typo	2021-02-20 17:40:04 +09:00
kenji yoshida	a46c821673	use slash syntax instead of old "in" https://github.com/sbt/sbt/pull/6309	2021-02-17 15:29:21 +09:00
Scala Steward	cae843d18f	Update sbt-pgp to 2.1.2 (#2681 ) Co-authored-by: Naoki Takezoe <takezoe@gmail.com>	2021-02-16 18:55:11 +09:00
Scala Steward	40ffc689b0	Update testcontainers-scala to 0.39.1	2021-02-15 11:15:09 +09:00
Scala Steward	65afbd25b8	Update junit to 4.13.2	2021-02-14 09:31:50 +09:00
Scala Steward	458b30610f	Update HikariCP to 4.0.2	2021-02-13 18:22:22 +09:00
Scala Steward	a89608a2e2	Update testcontainers to 1.15.2	2021-02-12 11:22:40 +09:00
dependabot[bot]	0f45311d5e	Bump actions/cache from v2 to v2.1.4 Bumps [actions/cache](https://github.com/actions/cache) from v2 to v2.1.4. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2...26968a09c0ea4f3e233fdddbafd1166051a095f6) Signed-off-by: dependabot[bot] <support@github.com>	2021-02-09 18:19:41 +09:00
Jason Southwell	447ed6ce88	As is, the unsuspend API cannot unsuspend since it's not searching suspended accounts. This should allow the api to function without getting a 404. (#2660 ) Co-authored-by: Jason Southwell <jsouthwell@sivv.com>	2021-02-07 22:55:00 +09:00
Scala Steward	ab358a10bc	Update oauth2-oidc-sdk to 9.1	2021-02-06 08:00:20 +09:00
Scala Steward	5148851d49	Update testcontainers-scala to 0.39.0	2021-02-06 08:00:05 +09:00
Scala Steward	068ecd30fe	Update testcontainers-scala to 0.38.9	2021-02-06 03:19:26 +09:00
Scala Steward	5396c0ee58	Update sbt to 1.4.7	2021-02-06 03:19:10 +09:00
Scala Steward	2328c1878b	Update mariadb-java-client to 2.7.2	2021-01-31 15:49:57 +09:00
Scala Steward	bc9a6f464a	Update oauth2-oidc-sdk to 8.36	2021-01-31 15:49:47 +09:00
Scala Steward	4613fd4cb4	Update oauth2-oidc-sdk to 8.35	2021-01-28 21:41:02 +09:00
Scala Steward	ff89c8805c	Update ec4j-core to 0.3.0	2021-01-27 19:18:05 +09:00
Scala Steward	95d98c525b	Update sbt-scalafmt to 2.4.2	2021-01-27 19:17:41 +09:00
Scala Steward	bc78a38570	Update postgresql to 42.2.18 Co-authored-by: kenji yoshida <6b656e6a69@gmail.com>	2021-01-27 11:28:19 +09:00
Scala Steward	8db2398dd8	Update mariadb-java-client to 2.7.1	2021-01-27 11:03:16 +09:00
Scala Steward	e073ca74da	Update oauth2-oidc-sdk to 8.34.2	2021-01-27 11:03:09 +09:00
Scala Steward	50e899bf83	Update ec4j-core to 0.0.4	2021-01-27 11:02:56 +09:00
Scala Steward	5ddd6234e3	Update cache2k-all to 1.6.0.Final	2021-01-27 11:02:36 +09:00
Scala Steward	84fa11b5df	Update jetty to 9.4.36.v20210114	2021-01-27 11:01:57 +09:00
Scala Steward	f51db60fc7	Update mockito-core to 3.7.7	2021-01-27 11:01:14 +09:00
Scala Steward	351e72e8c2	Update sbt-scalafmt to 2.0.7	2021-01-27 11:01:00 +09:00
Scala Steward	a0f54b0b8e	Update tika-core to 1.25	2021-01-26 20:49:36 +09:00
Scala Steward	4c491e40c7	Update httpclient to 4.5.13	2021-01-26 20:49:19 +09:00
Scala Steward	54440d9cde	Update thumbnailator to 0.4.13	2021-01-26 20:48:42 +09:00
Scala Steward	ea8333844c	Update org.eclipse.jgit.archive, ... to 5.10.0.202012080955-r	2021-01-26 20:48:24 +09:00
Scala Steward	fc34df7008	Update github-api to 1.122	2021-01-26 20:48:05 +09:00
Scala Steward	d49d62edfc	Update junit to 4.13.1	2021-01-26 20:47:47 +09:00
Scala Steward	246e2e2de4	Update sbt-pgp to 2.1.1	2021-01-26 12:28:23 +09:00
Scala Steward	83b48d26ce	Update HikariCP to 4.0.1	2021-01-26 12:11:11 +09:00
Scala Steward	3d40094925	Update commons-net to 3.7.2	2021-01-26 12:10:56 +09:00
Scala Steward	2d7e8526ed	Update testcontainers-scala to 0.38.8	2021-01-26 11:39:45 +09:00
Scala Steward	7768f4c4dd	Update sbt-scalafmt to 2.0.0 (#2631 ) Co-authored-by: kenji yoshida <6b656e6a69@gmail.com>	2021-01-26 10:46:32 +09:00
kenji yoshida	e43fabf895	set timeout-minutes	2021-01-26 10:21:43 +09:00
Scala Steward	7cf83979a6	Update oauth2-oidc-sdk to 8.34.1	2021-01-26 10:19:16 +09:00
Scala Steward	1ecc30c570	Update typesafe:config to 1.4.1	2021-01-26 10:18:56 +09:00
Scala Steward	ee0721f40d	Update sbt-pgp to 1.1.2-1	2021-01-26 10:18:31 +09:00
kenji yoshida	07836edf84	Create .scala-steward.conf	2021-01-26 07:36:12 +09:00
Naoki Takezoe	bfbe40e027	Release GitBucket 4.35.3 (#2626 ) * Update version to 4.35.3 * Update README and CHANGELOG	2021-01-14 11:22:13 +09:00
Naoki Takezoe	842d3b6185	Fix timestamp which is set to create war file to epoch millis (#2627 )	2021-01-13 22:45:03 +09:00
Naoki Takezoe	086437ca4f	Set time to create war instead of specifying SOURCE_DATE_EPOCH (#2625 )	2021-01-13 11:14:28 +09:00
Naoki Takezoe	6e48435f38	Add screenshot to README	2021-01-10 22:01:47 +09:00
Naoki Takezoe	3b8e903cb5	Set SOURCE_DATE_EPOCH to build war file (#2623 )	2021-01-08 16:52:02 +09:00
onukura	55308f2deb	fix delete wiki page function (#2622 )	2021-01-07 22:42:05 +09:00
Naoki Takezoe	a913a95d5b	Release 4.35.2	2020-12-30 00:37:53 +09:00
Naoki Takezoe	870a20721c	Bump oauth2-oidc-sdk to 8.29.1 (#2617 )	2020-12-30 00:36:04 +09:00
Naoki Takezoe	df81f6e364	Upgrade gitbucket-notifications-plugin to 1.10.0 (#2616 )	2020-12-29 22:42:23 +09:00
pbg42	d4a892bf7f	Update CONTRIBUTING.md (#2613 ) corrected just a typo	2020-12-29 11:11:47 +09:00