Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-09 06:55:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fork-and-pullreq

Browse Source 
Conflicts:
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/service/WikiService.scala
	src/main/scala/util/JGitUtil.scala
This commit is contained in:
takezoe
2013-07-12 15:50:53 +09:00
parent 07cdc6002d f34f60b255
commit 0760b6a89c
41 changed files with 488 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/app/CreateRepositoryController.scala
View File

@@ -69,9 +69,13 @@ trait CreateRepositoryControllerBase extends ControllerBase {
// Create README.md
FileUtils.writeStringToFile(new File(tmpdir, "README.md"),
if(form.description.nonEmpty){
form.name + "\n===============\n\n" + form.description.get
form.name + "\n" +
"===============\n" +
"\n" +
form.description.get
} else {
form.name + "\n===============\n"
form.name + "\n" +
"===============\n"
}, "UTF-8")
val git = Git.open(tmpdir)
@@ -91,7 +95,7 @@ trait CreateRepositoryControllerBase extends ControllerBase {
recordCreateRepositoryActivity(loginUserName, form.name, loginUserName)
// redirect to the repository
redirect("/%s/%s".format(loginUserName, form.name))
redirect(s"/${loginUserName}/${form.name}")
})
post("/:owner/:repository/_fork")(referrersOnly { repository =>