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
This commit is contained in:
bati11
2014-05-03 10:51:18 +09:00
parent 843722f82e 619f72d929
commit ebb9d9329a
229 changed files with 230088 additions and 1037 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,7 +118,7 @@ trait IssuesControllerBase extends ControllerBase {
// notifications
Notifier().toNotify(repository, issueId, form.content.getOrElse("")){
Notifier.msgIssue(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
Notifier.msgIssue(s"${context.baseUrl}/${owner}/${name}/issues/${issueId}")
}
redirect(s"/${owner}/${name}/issues/${issueId}")
@@ -273,6 +273,15 @@ 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
}
})
val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
val milestoneId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
@@ -342,13 +351,13 @@ trait IssuesControllerBase extends ControllerBase {
case f =>
content foreach {
f.toNotify(repository, issueId, _){
Notifier.msgComment(s"${baseUrl}/${owner}/${name}/${
Notifier.msgComment(s"${context.baseUrl}/${owner}/${name}/${
if(issue.isPullRequest) "pull" else "issues"}/${issueId}#comment-${commentId}")
}
}
action foreach {
f.toNotify(repository, issueId, _){
Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
Notifier.msgStatus(s"${context.baseUrl}/${owner}/${name}/issues/${issueId}")
}
}
}