Newer
Older
gitbucket_jkp / src / main / twirl / pulls / mergecheck.scala.html
@Naoki Takezoe Naoki Takezoe on 23 Nov 2014 358 bytes (refs #507)Small fix about pull request UI
@(hasConflict: Boolean)
@if(hasConflict){
  <h4>We can’t automatically merge these branches</h4>
  <p>Don't worry, you can still submit the pull request.</p>
} else {
  <h4 style="color: #468847;">Able to merge</h4>
  <p>These branches can be automatically merged.</p>
}
<input type="submit" class="btn btn-success btn-block" value="Create pull request"/>