diff options
Diffstat (limited to 'web_src')
| -rw-r--r-- | web_src/js/components/PullRequestMergeForm.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue index 75fbceb800..08b1f9cb86 100644 --- a/web_src/js/components/PullRequestMergeForm.vue +++ b/web_src/js/components/PullRequestMergeForm.vue @@ -48,7 +48,7 @@ <div v-if="!showActionForm" class="df"> <!-- the merge button --> - <div class="ui buttons merge-button" :class="mergeButtonStyleClass" @click="toggleActionForm(true)" > + <div class="ui buttons merge-button" :class="[mergeForm.emptyCommit ? 'grey' : mergeForm.allOverridableChecksOk ? 'green' : 'red']" @click="toggleActionForm(true)" > <button class="ui button"> <svg-icon name="octicon-git-merge"/> <span class="button-text"> |