Fix for GitBucket 4.25.0

Fix for GitBucket 4.25.0

Author: takezoe

README.md

@@ -4,6 +4,7 @@ This is a GitBucket plug-in which provides code snippet repository like Gist.
 
 Plugin version | GitBucket version
 :--------------|:--------------------
+4.15.x         | 4.25.x -
 4.13.x, 4.14.x | 4.23.x -
 4.12.x         | 4.21.x -
 4.11.x         | 4.19.x -

build.sbt

@@ -1,8 +1,8 @@
 organization := "io.github.gitbucket"
 name := "gitbucket-gist-plugin"
-version := "4.14.0"
+version := "4.15.0"
 scalaVersion := "2.12.6"
-gitbucketVersion := "4.24.0"
+gitbucketVersion := "4.25.0"
 
 scalacOptions := Seq("-deprecation", "-feature", "-language:postfixOps")
 javacOptions in compile ++= Seq("-target", "8", "-source", "8")

src/main/scala/Plugin.scala

@@ -36,7 +36,8 @@ class Plugin extends gitbucket.core.plugin.Plugin {
     new Version("4.11.0"),
     new Version("4.12.0"),
     new Version("4.13.0"),
-    new Version("4.14.0")
+    new Version("4.14.0"),
+    new Version("4.15.0")
   )
 
   override def initialize(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit = {

src/main/scala/gitbucket/gist/controller/GistController.scala

@@ -272,6 +272,7 @@ trait GistControllerBase extends ControllerBase {
       html.profile(
         account,
         if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
+        getAccountExtraMailAddresses(userName),
         result._1
       )
     } getOrElse NotFound

src/main/twirl/gitbucket/gist/editor.scala.html

@@ -36,7 +36,9 @@
   }
 
   @if(fileName.nonEmpty){
-    editor.getSession().setMode("ace/mode/@helpers.editorType(fileName)");
+    var modelist = ace.require("ace/ext/modelist");
+    var mode = modelist.getModeForPath("@fileName");
+    editor.getSession().setMode(mode.mode);
   }
 
   $('#wrap-@i').change(function(){

src/main/twirl/gitbucket/gist/profile.scala.html

@@ -1,7 +1,7 @@
-@(account: gitbucket.core.model.Account, groupNames: List[String],
+@(account: gitbucket.core.model.Account, groupNames: List[String], extraMailAddresses: List[String],
   gists: Seq[gitbucket.gist.model.Gist])(implicit context: gitbucket.core.controller.Context)
 @import gitbucket.gist.model.Mode
-@gitbucket.core.account.html.main(account, groupNames, "snippets"){
+@gitbucket.core.account.html.main(account, groupNames, "snippets", extraMailAddresses){
   @if(gists.isEmpty){
     No snippets
   } else {