diff --git a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala index 85e799b..8a317e5 100644 --- a/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala +++ b/src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala @@ -294,7 +294,7 @@ * Display the danger zone. */ get("/:owner/:repository/settings/danger")(ownerOnly { - html.danger(_) + html.danger(_, flash.get("info")) }) /** @@ -342,7 +342,8 @@ git.gc(); } } - redirect(s"/${repository.owner}/${repository.name}/danger") + flash += "info" -> "Garbage collection has been executed." + redirect(s"/${repository.owner}/${repository.name}/settings/danger") }) /** diff --git a/src/main/twirl/gitbucket/core/settings/danger.scala.html b/src/main/twirl/gitbucket/core/settings/danger.scala.html index c5941a1..f97258a 100644 --- a/src/main/twirl/gitbucket/core/settings/danger.scala.html +++ b/src/main/twirl/gitbucket/core/settings/danger.scala.html @@ -1,9 +1,10 @@ -@(repository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context) +@(repository: gitbucket.core.service.RepositoryService.RepositoryInfo, info: Option[Any])(implicit context: gitbucket.core.controller.Context) @import context._ @import gitbucket.core.view.helpers._ @html.main("Danger Zone", Some(repository)){ @html.menu("settings", repository){ @menu("danger", repository){ + @helper.html.information(info)
Danger Zone