@(hasConflict: Boolean, hasProblem: Boolean, issue: gitbucket.core.model.Issue, pullreq: gitbucket.core.model.PullRequest, statuses: List[model.CommitStatus], branchProtection: gitbucket.core.service.ProtectedBrancheService.ProtectedBranchInfo, hasRequiredStatusProblem: Boolean, originRepository: gitbucket.core.service.RepositoryService.RepositoryInfo, forkedRepository: gitbucket.core.service.RepositoryService.RepositoryInfo)(implicit context: gitbucket.core.controller.Context) @import gitbucket.core.service.SystemSettingsService @import context._ @import gitbucket.core.view.helpers._ @import model.CommitState
@if(!statuses.isEmpty){
@defining(statuses.groupBy(_.state)){ stateMap => @defining(CommitState.combine(stateMap.keySet)){ state =>
@commitStateIcon(state) @commitStateText(state, pullreq.commitIdTo) — @{stateMap.map{ case (keyState, states) => states.size+" "+keyState.name }.mkString(", ")} checks
@statuses.map{ status =>
@branchProtection.contexts.find(_==status.context).map{ url => Required } @status.targetUrl.map{ url => Details }
@commitStateIcon(status.state) @status.context @status.description.map{ desc => — @desc }
}
} }
}
@if(hasConflict){
This branch has conflicts that must be resolved
Use the command line to resolve conflicts before continuing.
} else { @if(hasRequiredStatusProblem) {
Required statuses must pass before merging.
All required status checks on this pull request must run successfully to enable automatic merging.
} else {
Merging can be performed automatically.
Merging can be performed automatically.
} }
You can also merge branches on the command line.