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 #2)Add conflict checking.

Browse Source
This commit is contained in:
takezoe
2013-07-16 03:43:26 +09:00
parent e59ae9c6e9
commit f53f71ecf1
4 changed files with 103 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@
commits: Seq[Seq[util.JGitUtil.CommitInfo]],
diffs: Seq[util.JGitUtil.DiffInfo],
commitId: String,
hasConflict: Boolean,
hasWritePermission: Boolean,
repository: service.RepositoryService.RepositoryInfo,
requestRepositoryUrl: String)(implicit context: app.Context)
@@ -20,7 +21,7 @@
</ul>
<div class="tab-content">
<div class="tab-pane active" id="discussion">
@pulls.html.discussion(issue, pullreq, comments, collaborators, milestones, hasWritePermission, repository, requestRepositoryUrl)
@pulls.html.discussion(issue, pullreq, comments, collaborators, milestones, hasConflict, hasWritePermission, repository, requestRepositoryUrl)
</div>
<div class="tab-pane" id="commits">
@pulls.html.commits(issue, pullreq, commits, hasWritePermission, repository)