mirror of https://github.com/go-gitea/gitea
Merge a8db0e1e8a
into a21ca9b5a5
This commit is contained in:
commit
8248aa77b6
|
@ -138,7 +138,7 @@ export default {
|
|||
|
||||
<div v-if="!showActionForm" class="tw-flex">
|
||||
<!-- the merge button -->
|
||||
<div class="ui buttons merge-button" :class="[mergeForm.emptyCommit ? '' : mergeForm.allOverridableChecksOk ? 'primary' : 'red']" @click="toggleActionForm(true)">
|
||||
<div v-if="!mergeForm.hasPendingPullRequestMerge" class="ui buttons merge-button" :class="[mergeForm.emptyCommit ? '' : mergeForm.allOverridableChecksOk ? 'primary' : 'red']" @click="toggleActionForm(true)">
|
||||
<button class="ui button">
|
||||
<svg-icon name="octicon-git-merge"/>
|
||||
<span class="button-text">
|
||||
|
|
Loading…
Reference in New Issue