diff --git a/README.md b/README.md index 6d10e52..77935cd 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,7 @@ - [gitbucket-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin) - [gitbucket-emoji-plugin](https://github.com/gitbucket/gitbucket-emoji-plugin) - [gitbucket-pages-plugin](https://github.com/gitbucket/gitbucket-pages-plugin) +- [gitbucket-notifications-plugin](https://github.com/gitbucket/gitbucket-notifications-plugin) You can find more plugins made by the community at [GitBucket community plugins](http://gitbucket-plugins.github.io/). @@ -71,12 +72,13 @@ Release Notes ------------- -### 4.15.0 - 5 Aug 2017 (Plan) +### 4.15.0 - 5 Aug 2017 - Bundle GitBucket organization plugins - Notifications plugin - Plugin hot deployment -- Markdown preview in comment editing forms +- Update Slick to 3.2.1 from 3.2.0 - Support ed25519 keys for SSH +- Markdown preview in comment editing forms ### 4.14.1 - 4 Jul 2017 - Bug fix: Possibility of error in forking repository diff --git a/build.sbt b/build.sbt index c350973..8636f56 100644 --- a/build.sbt +++ b/build.sbt @@ -152,7 +152,11 @@ val json = IO read(Keys.baseDirectory.value / "plugins.json") PluginsJson.parse(json).foreach { case (plugin, version) => - val url = s"https://github.com/gitbucket/${plugin}/releases/download/${version}/${plugin}_${scalaBinaryVersion.value}-${version}.jar" + val url = if(plugin == "gitbucket-pages-plugin"){ + s"https://github.com/gitbucket/${plugin}/releases/download/v${version}/${plugin}_${scalaBinaryVersion.value}-${version}.jar" + } else { + s"https://github.com/gitbucket/${plugin}/releases/download/${version}/${plugin}_${scalaBinaryVersion.value}-${version}.jar" + } log info s"Download: ${url}" IO download(new java.net.URL(url), pluginsDir / s"${plugin}_${scalaBinaryVersion.value}-${version}.jar") } diff --git a/plugins.json b/plugins.json index 7e5663c..835a742 100644 --- a/plugins.json +++ b/plugins.json @@ -23,7 +23,7 @@ "file": "gitbucket-emoji-plugin_2.12-4.4.0.jar" } ], - "default": true + "default": false }, { "id": "gist", @@ -36,7 +36,7 @@ "file": "gitbucket-gist-plugin_2.12-4.10.0.jar" } ], - "default": true + "default": false }, { "id": "pages", @@ -49,6 +49,6 @@ "file": "gitbucket-pages-plugin_2.12-1.5.0.jar" } ], - "default": true + "default": false } ] diff --git a/src/main/scala/gitbucket/core/controller/AccountController.scala b/src/main/scala/gitbucket/core/controller/AccountController.scala index 77eaa1a..d0b22db 100644 --- a/src/main/scala/gitbucket/core/controller/AccountController.scala +++ b/src/main/scala/gitbucket/core/controller/AccountController.scala @@ -232,6 +232,10 @@ } getOrElse NotFound() }) + get("/captures/(.*)".r) { + multiParams("captures").head + } + get("/:userName/_delete")(oneselfOnly { val userName = params("userName")