From 0e498d1a81d3934c63266db79b1ec1540076f51b Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 31 Jul 2017 01:29:13 +0900 Subject: [PATCH 1/5] Add a special rule for pages-plugin's url --- build.sbt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index c35097386..8636f56e8 100644 --- a/build.sbt +++ b/build.sbt @@ -152,7 +152,11 @@ executableKey := { 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") } From 11903e9728d3b8efd427830ed5b7048197b8f90e Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 31 Jul 2017 09:34:04 +0900 Subject: [PATCH 2/5] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6d10e525e..fac9e3c77 100644 --- a/README.md +++ b/README.md @@ -75,8 +75,9 @@ Release Notes - 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 From e28b0394ec4c0641dc18fcde31ba432faac03a1a Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 31 Jul 2017 09:35:43 +0900 Subject: [PATCH 3/5] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fac9e3c77..f946560a8 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,7 @@ GitBucket has a plug-in system that allows extra functionality. Officially the f - [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/). From a14394dd88f639bd0ca4dd734bf40fc11c961d2f Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Mon, 31 Jul 2017 11:59:19 +0900 Subject: [PATCH 4/5] Gist, Emoji and Pages plugin are disabled in default --- plugins.json | 6 +++--- .../scala/gitbucket/core/controller/AccountController.scala | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins.json b/plugins.json index 7e5663ce4..835a7427c 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 77eaa1a94..d0b22dbf7 100644 --- a/src/main/scala/gitbucket/core/controller/AccountController.scala +++ b/src/main/scala/gitbucket/core/controller/AccountController.scala @@ -232,6 +232,10 @@ trait AccountControllerBase extends AccountManagementControllerBase { } getOrElse NotFound() }) + get("/captures/(.*)".r) { + multiParams("captures").head + } + get("/:userName/_delete")(oneselfOnly { val userName = params("userName") From eafdd0fb61e7661a29acfcd32a2a0f155a5ad46e Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sat, 5 Aug 2017 11:45:45 +0900 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f946560a8..77935cd88 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ Support Release Notes ------------- -### 4.15.0 - 5 Aug 2017 (Plan) +### 4.15.0 - 5 Aug 2017 - Bundle GitBucket organization plugins - Notifications plugin - Plugin hot deployment