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

Merge branch 'master' into feature-tasklist

Browse Source 
Conflicts:
	src/main/twirl/issues/commentform.scala.html
	src/main/twirl/issues/create.scala.html
	src/main/twirl/pulls/compare.scala.html
	src/main/twirl/wiki/edit.scala.html
This commit is contained in:
bati11
2014-05-31 12:17:30 +09:00
parent ebb9d9329a db5395ddbc
commit 6175eb7c08
80 changed files with 2812 additions and 1766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/scala/app/IssuesController.scala
View File

@@ -274,12 +274,14 @@ trait IssuesControllerBase extends ControllerBase {
})
get("/:owner/:repository/_attached/:file")(referrersOnly { repository =>
defining(new java.io.File(Directory.getAttachedDir(repository.owner, repository.name), params("file"))){ file =>
if(file.exists) {
contentType = FileUtil.getMimeType(file)
file
} else NotFound
}
(Directory.getAttachedDir(repository.owner, repository.name) match {
case dir if(dir.exists && dir.isDirectory) =>
dir.listFiles.find(_.getName.startsWith(params("file") + ".")).map { file =>
contentType = FileUtil.getMimeType(file.getName)
file
}
case _ => None
}) getOrElse NotFound
})
val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")