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

(refs #94)The merge-guide is separated as HTML fragment and retrieve them by Ajax.

Browse Source
This commit is contained in:
takezoe
2013-09-23 13:25:06 +09:00
parent 7b774aee1a
commit bb03a6fc9b
6 changed files with 201 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/twirl/pulls/pullreq.scala.html
View File

@@ -5,10 +5,8 @@
milestones: List[(model.Milestone, Int, Int)],
dayByDayCommits: Seq[Seq[util.JGitUtil.CommitInfo]],
diffs: Seq[util.JGitUtil.DiffInfo],
hasConflict: Boolean,
hasWritePermission: Boolean,
repository: service.RepositoryService.RepositoryInfo,
requestRepositoryUrl: String)(implicit context: app.Context)
repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
@import context._
@import view.helpers._
@html.main("%s - Pull Request #%d - %s/%s".format(issue.title, issue.issueId, repository.owner, repository.name)){
@@ -39,7 +37,7 @@
</ul>
<div class="tab-content">
<div class="tab-pane active" id="discussion">
@pulls.html.discussion(issue, pullreq, comments, collaborators, milestones, hasConflict, hasWritePermission, repository, requestRepositoryUrl)
@pulls.html.discussion(issue, pullreq, comments, collaborators, milestones, hasWritePermission, repository)
</div>
<div class="tab-pane" id="commits">
@pulls.html.commits(dayByDayCommits, repository)