Skip to content

Commit fef364e

Browse files
GiteaBotlunny
andauthored
Fix bug automerge cannot be chosed when there is only 1 merge style (#33040) (#33043)
Backport #33040 by @lunny This is a quick bug fix. Even if there is only 1 merge style, the dropdown menu will still be displayed to allow users to choose automerge. Fix #32448 Co-authored-by: Lunny Xiao <[email protected]>
1 parent ce6a60a commit fef364e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

web_src/js/components/PullRequestMergeForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ function clearMergeMessage() {
147147
</template>
148148
</span>
149149
</button>
150-
<div class="ui dropdown icon button" @click.stop="showMergeStyleMenu = !showMergeStyleMenu" v-if="mergeStyleAllowedCount>1">
150+
<div class="ui dropdown icon button" @click.stop="showMergeStyleMenu = !showMergeStyleMenu">
151151
<svg-icon name="octicon-triangle-down" :size="14"/>
152152
<div class="menu" :class="{'show':showMergeStyleMenu}">
153153
<template v-for="msd in mergeForm.mergeStyles">

0 commit comments

Comments
 (0)