Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-10 23:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pr-api-pr-merged

Browse Source
This commit is contained in:
Naoki Takezoe
2017-08-06 02:59:51 +09:00
committed by GitHub
parent f073112814 eafdd0fb61
commit c7d46ee18f
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@@ -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-gist-plugin](https://github.com/gitbucket/gitbucket-gist-plugin)
- [gitbucket-emoji-plugin](https://github.com/gitbucket/gitbucket-emoji-plugin) - [gitbucket-emoji-plugin](https://github.com/gitbucket/gitbucket-emoji-plugin)
- [gitbucket-pages-plugin](https://github.com/gitbucket/gitbucket-pages-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/). You can find more plugins made by the community at [GitBucket community plugins](http://gitbucket-plugins.github.io/).
@@ -71,12 +72,13 @@ Support
Release Notes Release Notes
------------- -------------
### 4.15.0 - 5 Aug 2017 (Plan) ### 4.15.0 - 5 Aug 2017
- Bundle GitBucket organization plugins - Bundle GitBucket organization plugins
- Notifications plugin - Notifications plugin
- Plugin hot deployment - Plugin hot deployment
- Markdown preview in comment editing forms - Update Slick to 3.2.1 from 3.2.0
- Support ed25519 keys for SSH - Support ed25519 keys for SSH
- Markdown preview in comment editing forms
### 4.14.1 - 4 Jul 2017 ### 4.14.1 - 4 Jul 2017
- Bug fix: Possibility of error in forking repository - Bug fix: Possibility of error in forking repository

6
build.sbt
View File

@@ -152,7 +152,11 @@ executableKey := {
val json = IO read(Keys.baseDirectory.value / "plugins.json") val json = IO read(Keys.baseDirectory.value / "plugins.json")
PluginsJson.parse(json).foreach { case (plugin, version) => 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}" log info s"Download: ${url}"
IO download(new java.net.URL(url), pluginsDir / s"${plugin}_${scalaBinaryVersion.value}-${version}.jar") IO download(new java.net.URL(url), pluginsDir / s"${plugin}_${scalaBinaryVersion.value}-${version}.jar")
} }

6
plugins.json
View File

@@ -23,7 +23,7 @@
"file": "gitbucket-emoji-plugin_2.12-4.4.0.jar" "file": "gitbucket-emoji-plugin_2.12-4.4.0.jar"
} }
], ],
"default": true "default": false
}, },
{ {
"id": "gist", "id": "gist",
@@ -36,7 +36,7 @@
"file": "gitbucket-gist-plugin_2.12-4.10.0.jar" "file": "gitbucket-gist-plugin_2.12-4.10.0.jar"
} }
], ],
"default": true "default": false
}, },
{ {
"id": "pages", "id": "pages",
@@ -49,6 +49,6 @@
"file": "gitbucket-pages-plugin_2.12-1.5.0.jar" "file": "gitbucket-pages-plugin_2.12-1.5.0.jar"
} }
], ],
"default": true "default": false
} }
] ]

4
src/main/scala/gitbucket/core/controller/AccountController.scala
View File

@@ -232,6 +232,10 @@ trait AccountControllerBase extends AccountManagementControllerBase {
} getOrElse NotFound() } getOrElse NotFound()
}) })
get("/captures/(.*)".r) {
multiParams("captures").head
}
get("/:userName/_delete")(oneselfOnly { get("/:userName/_delete")(oneselfOnly {
val userName = params("userName") val userName = params("userName")