diff --git a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala index 57f1495..8d06409 100644 --- a/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/SystemSettingsController.scala @@ -13,9 +13,7 @@ import gitbucket.core.util.Directory._ import gitbucket.core.util.StringUtil._ import io.github.gitbucket.scalatra.forms._ -import io.github.gitbucket.solidbase.manager.JDBCVersionManager import org.apache.commons.io.{FileUtils, IOUtils} -import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail} import org.scalatra.i18n.Messages class SystemSettingsController extends SystemSettingsControllerBase @@ -176,11 +174,7 @@ }) get("/admin/plugins")(adminOnly { - val manager = new JDBCVersionManager(request2Session(request).conn) - val plugins = PluginRegistry().getPlugins().map { plugin => - (plugin, manager.getCurrentVersion(plugin.pluginId)) - } - html.plugins(plugins) + html.plugins(PluginRegistry().getPlugins()) }) diff --git a/src/main/twirl/gitbucket/core/admin/plugins.scala.html b/src/main/twirl/gitbucket/core/admin/plugins.scala.html index f210691..505c1bc 100644 --- a/src/main/twirl/gitbucket/core/admin/plugins.scala.html +++ b/src/main/twirl/gitbucket/core/admin/plugins.scala.html @@ -1,16 +1,16 @@ -@(plugins: List[(gitbucket.core.plugin.PluginInfo, String)])(implicit context: gitbucket.core.controller.Context) +@(plugins: List[gitbucket.core.plugin.PluginInfo])(implicit context: gitbucket.core.controller.Context) @gitbucket.core.html.main("Plugins"){ @gitbucket.core.admin.html.menu("plugins") {

Installed plugins

@if(plugins.size > 0) { - @plugins.map { case (plugin, migrationVersion) => + @plugins.map { plugin =>
@plugin.pluginName
@@ -20,7 +20,7 @@
- @migrationVersion @if(plugin.pluginVersion != migrationVersion){ (Migration is failed, installed version is @plugin.pluginVersion) } + @plugin.pluginVersion