From 3e53008d351740a993c0f790c631ed4302f432a6 Mon Sep 17 00:00:00 2001 From: Uli Heller Date: Tue, 4 Jul 2017 06:45:48 +0200 Subject: [PATCH 1/6] Updated to jgit-4.8.0.201706111038-r --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 22e7b81ce..11edb16c3 100644 --- a/build.sbt +++ b/build.sbt @@ -21,8 +21,8 @@ resolvers ++= Seq( "amateras-snapshot" at "http://amateras.sourceforge.jp/mvn-snapshot/" ) libraryDependencies ++= Seq( - "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "4.7.0.201704051617-r", - "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "4.7.0.201704051617-r", + "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "4.8.0.201706111038-r", + "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "4.8.0.201706111038-r", "org.scalatra" %% "scalatra" % ScalatraVersion, "org.scalatra" %% "scalatra-json" % ScalatraVersion, "org.json4s" %% "json4s-jackson" % "3.5.1", From 0e795f58dde6aac7aae1e80dde0eac2020f6a7c0 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Wed, 5 Jul 2017 02:17:37 +0900 Subject: [PATCH 2/6] Remove unnecessary semicolon --- .../core/controller/RepositorySettingsController.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala index 4ef39e302..8d003f507 100644 --- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala @@ -150,7 +150,7 @@ trait RepositorySettingsControllerBase extends ControllerBase { get("/:owner/:repository/settings/branches")(ownerOnly { repository => val protecteions = getProtectedBranchList(repository.owner, repository.name) html.branches(repository, protecteions, flash.get("info")) - }); + }) /** Update default branch */ post("/:owner/:repository/settings/update_default_branch", defaultBranchForm)(ownerOnly { (form, repository) => From aab9b71901fc8f03bea6459b4eaa6dfeb4b46a47 Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Thu, 6 Jul 2017 00:04:41 +0900 Subject: [PATCH 3/6] Add repo-link class to repository link at sidebar menu Fixes #1629 --- src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html b/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html index 600ea73e7..9f59a2ff8 100644 --- a/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html +++ b/src/main/twirl/gitbucket/core/dashboard/sidebar.scala.html @@ -14,7 +14,7 @@ } else {
    • @userRepositories.zipWithIndex.map { case (repository, i) => -
  • +
  • @if(repository.owner == context.loginAccount.get.userName){ @gitbucket.core.helper.html.repositoryicon(repository, false) @repository.name } else { @@ -30,7 +30,7 @@ } else {
    • @recentRepositories.zipWithIndex.map { case (repository, i) => -
  • +
  • @gitbucket.core.helper.html.repositoryicon(repository, false) @repository.owner/@repository.name
    • } From b278bfd1599ab30279c7f6cd673ba0aa2f41ed9e Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Fri, 7 Jul 2017 01:54:20 +0900 Subject: [PATCH 4/6] (refs #1633)Bugfix for --max_file_size parameter --- src/main/java/JettyLauncher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java index 94525fde9..849ed3c2b 100644 --- a/src/main/java/JettyLauncher.java +++ b/src/main/java/JettyLauncher.java @@ -40,7 +40,7 @@ public class JettyLauncher { } break; case "--max_file_size": - System.setProperty("gitbucket.maxFileSize", dim[2]); + System.setProperty("gitbucket.maxFileSize", dim[1]); break; case "--gitbucket.home": System.setProperty("gitbucket.home", dim[1]); From 73ed69a4ad0d00faf4de1c4792bb70cdbb6e4358 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 8 Jul 2017 02:58:28 +0900 Subject: [PATCH 5/6] Add repositoryHeaderComponent extension point --- .../scala/gitbucket/core/plugin/Plugin.scala | 17 +++++++++++++++-- .../gitbucket/core/plugin/PluginRegistory.scala | 5 +++++ .../gitbucket/core/issues/issueinfo.scala.html | 4 ++-- src/main/twirl/gitbucket/core/menu.scala.html | 5 +++++ 4 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/main/scala/gitbucket/core/plugin/Plugin.scala b/src/main/scala/gitbucket/core/plugin/Plugin.scala index 3d2b51bcf..0cb6a64e7 100644 --- a/src/main/scala/gitbucket/core/plugin/Plugin.scala +++ b/src/main/scala/gitbucket/core/plugin/Plugin.scala @@ -121,6 +121,16 @@ abstract class Plugin { */ def pullRequestHooks(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[PullRequestHook] = Nil + /** + * Override to add repository headers. + */ + val repositoryHeaders: Seq[(RepositoryInfo, Context) => Option[Html]] = Nil + + /** + * Override to add repository headers. + */ + def repositoryHeaders(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(RepositoryInfo, Context) => Option[Html]] = Nil + /** * Override to add global menus. */ @@ -266,6 +276,9 @@ abstract class Plugin { (pullRequestHooks ++ pullRequestHooks(registry, context, settings)).foreach { pullRequestHook => registry.addPullRequestHook(pullRequestHook) } + (repositoryHeaders ++ repositoryHeaders(registry, context, settings)).foreach { repositoryHeader => + registry.addRepositoryHeader(repositoryHeader) + } (globalMenus ++ globalMenus(registry, context, settings)).foreach { globalMenu => registry.addGlobalMenu(globalMenu) } @@ -287,8 +300,8 @@ abstract class Plugin { (dashboardTabs ++ dashboardTabs(registry, context, settings)).foreach { dashboardTab => registry.addDashboardTab(dashboardTab) } - (issueSidebars ++ issueSidebars(registry, context, settings)).foreach { issueSidebar => - registry.addIssueSidebar(issueSidebar) + (issueSidebars ++ issueSidebars(registry, context, settings)).foreach { issueSidebarComponent => + registry.addIssueSidebar(issueSidebarComponent) } (assetsMappings ++ assetsMappings(registry, context, settings)).foreach { assetMapping => registry.addAssetsMapping((assetMapping._1, assetMapping._2, getClass.getClassLoader)) diff --git a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala index c87adbf42..f06584ea2 100644 --- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala +++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala @@ -44,6 +44,7 @@ class PluginRegistry { private val pullRequestHooks = new ListBuffer[PullRequestHook] pullRequestHooks += new gitbucket.core.util.Notifier.PullRequestHook() + private val repositoryHeaders = new ListBuffer[(RepositoryInfo, Context) => Option[Html]] private val globalMenus = new ListBuffer[(Context) => Option[Link]] private val repositoryMenus = new ListBuffer[(RepositoryInfo, Context) => Option[Link]] private val repositorySettingTabs = new ListBuffer[(RepositoryInfo, Context) => Option[Link]] @@ -128,6 +129,10 @@ class PluginRegistry { def getPullRequestHooks: Seq[PullRequestHook] = pullRequestHooks.toSeq + def addRepositoryHeader(repositoryHeader: (RepositoryInfo, Context) => Option[Html]): Unit = repositoryHeaders += repositoryHeader + + def getRepositoryHeaders: Seq[(RepositoryInfo, Context) => Option[Html]] = repositoryHeaders.toSeq + def addGlobalMenu(globalMenu: (Context) => Option[Link]): Unit = globalMenus += globalMenu def getGlobalMenus: Seq[(Context) => Option[Link]] = globalMenus.toSeq diff --git a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html index 4b0fb889f..cbd732dfa 100644 --- a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html +++ b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html @@ -148,8 +148,8 @@ } @issue.map { issue => - @gitbucket.core.plugin.PluginRegistry().getIssueSidebars.map { sidebar => - @sidebar(issue, repository, context) + @gitbucket.core.plugin.PluginRegistry().getIssueSidebars.map { sidebarComponent => + @sidebarComponent(issue, repository, context) }
    diff --git a/src/main/twirl/gitbucket/core/menu.scala.html b/src/main/twirl/gitbucket/core/menu.scala.html index c6f5f7016..3106881dd 100644 --- a/src/main/twirl/gitbucket/core/menu.scala.html +++ b/src/main/twirl/gitbucket/core/menu.scala.html @@ -74,6 +74,11 @@ @gitbucket.core.helper.html.information(info) @gitbucket.core.helper.html.error(error)
    +
    + @gitbucket.core.plugin.PluginRegistry().getRepositoryHeaders.map { repositoryHeaderComponent => + @repositoryHeaderComponent(repository, context) + } +
    @gitbucket.core.helper.html.repositoryicon(repository, true) @repository.owner / @repository.name From e18bed12c0efe87bd348f45b1b8eb323a652637a Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 8 Jul 2017 14:04:50 +0900 Subject: [PATCH 6/6] Update version to 4.15.0-SNAPSHOT --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 3facaf76d..116715d76 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ val Organization = "io.github.gitbucket" val Name = "gitbucket" -val GitBucketVersion = "4.14.1" +val GitBucketVersion = "4.15.0-SNAPSHOT" val ScalatraVersion = "2.5.0" val JettyVersion = "9.3.19.v20170502"