Newer
Older
GitBucket / src / main / twirl / gitbucket / core / pulls / mergecheck.scala.html
@Naoki Takezoe Naoki Takezoe on 15 Aug 2015 538 bytes Improve the pull request creation form
@(hasConflict: Boolean)
<div style="margin-top: 8px;">
  @if(hasConflict){
    <i class="octicon octicon-x" style="color: #bd2c00"></i>
    <span class="strong" style="color: #bd2c00;">Can’t automatically merge.</span>
    <span class="muted">Don’t worry, you can still create the pull request.</span>
  } else {
    <i class="octicon octicon-check" style="color: #6cc644"></i>
    <span class="strong" style="color: #6cc644">Able to merge.</span>
    <span class="muted">These branches can be automatically merged.</span>
  }
</div>