Merge branch 'gitbucket-3.5'

Conflicts:
	src/main/scala/Plugin.scala

Author: takezoe

.gitignore

@@ -19,3 +19,7 @@ project/plugins/project/
 # IntelliJ specific
 .idea/
 .idea_modules/
+
+# Ensime
+.ensime
+.ensime_cache/

project/build.scala

@@ -25,7 +25,7 @@ object MyBuild extends Build {
       "amateras-repo" at "http://amateras.sourceforge.jp/mvn/"
     ),
     libraryDependencies ++= Seq(
-      "gitbucket"          % "gitbucket-assembly" % "3.4.0" % "provided",
+      "gitbucket"          % "gitbucket-assembly" % "3.5.0" % "provided",
       "com.typesafe.play" %% "twirl-compiler"     % "1.0.4" % "provided",
       "javax.servlet"      % "javax.servlet-api"  % "3.1.0" % "provided"
     ),

src/main/resources/images/menu-revisions-active.png

@@ -0,0 +1,2 @@
+ALTER TABLE GIST ADD COLUMN ORIGIN_USER_NAME VARCHAR(100);
+ALTER TABLE GIST ADD COLUMN ORIGIN_REPOSITORY_NAME VARCHAR(100);

src/main/resources/images/menu-revisions.png

@@ -1,6 +1,8 @@
+import gitbucket.core.model._
+import gitbucket.core.service.AccountService
 import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.gist.controller.GistController
-import gitbucket.core.plugin.PluginRegistry
+import gitbucket.core.plugin._
 import gitbucket.core.util.Version
 import java.io.File
 import javax.servlet.ServletContext
@@ -15,22 +17,14 @@ class Plugin extends gitbucket.core.plugin.Plugin {
   override val description: String = "Provides Gist feature on GitBucket."
 
   override val versions: List[Version] = List(
+    Version(1, 3),
     Version(1, 2),
     Version(1, 0)
   )
 
   override def initialize(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit = {
     super.initialize(registry, context, settings)
 
-    // Add Snippet link to the header
-    val path = settings.baseUrl.getOrElse(context.getContextPath)
-    registry.addJavaScript(".*",
-      s"""
-        |$$('a.brand').after(
-        |  $$('<span style="float: left; margin-top: 10px;">|&nbsp;&nbsp;&nbsp;&nbsp;<a href="${path}/gist" style="color: black;">Snippet</a></span>')
-        |);
-      """.stripMargin)
-
     // Create gist repository directory
     val rootdir = new File(GistRepoDir)
     if(!rootdir.exists){
@@ -40,16 +34,39 @@ class Plugin extends gitbucket.core.plugin.Plugin {
     println("-- Gist plug-in initialized --")
   }
 
+  override val repositoryRoutings = Seq(
+    GitRepositoryRouting("gist/(.+?)/(.+?)\\.git", "gist/$1/$2", new GistRepositoryFilter())
+  )
+
   override val controllers = Seq(
     "/*" -> new GistController()
   )
 
-  override val images = Seq(
-    "images/menu-revisions-active.png" -> fromClassPath("images/menu-revisions-active.png"),
-    "images/menu-revisions.png"        -> fromClassPath("images/menu-revisions.png"),
-    "images/snippet.png"               -> fromClassPath("images/snippet.png")
-  )
+  override def javaScripts(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, String)] = {
+    // Add Snippet link to the header
+    val path = settings.baseUrl.getOrElse(context.getContextPath)
+    Seq(
+      ".*" -> s"""
+        |$$('a.global-header-menu:last').after(
+        |  $$('<a href="${path}/gist" class="global-header-menu">Gist</a>')
+        |);
+      """.stripMargin
+    )
+  }
+}
+
+class GistRepositoryFilter extends GitRepositoryFilter with AccountService {
 
-  override def shutdown(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit = {
+  override def filter(path: String, userName: Option[String], settings: SystemSettings, isUpdating: Boolean)
+                     (implicit session: Session): Boolean = {
+    if(isUpdating){
+      (for {
+        userName <- userName
+        account  <- getAccountByUserName(userName)
+      } yield
+        path.startsWith("/" + userName + "/") || account.isAdmin
+      ).getOrElse(false)
+    } else true
   }
+
 }