diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2024-12-29 19:04:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-30 03:04:22 +0000 |
| commit | 344c89ea34bda1ac7382f8cba210ee325e07597e (patch) | |
| tree | 45ba606d2e158595a5b1f125f1254935ef3c174b | |
| parent | 232867cff6d24e70892e55d3205ebdad0c6bf3d5 (diff) | |
| download | gitea-344c89ea34bda1ac7382f8cba210ee325e07597e.tar.gz gitea-344c89ea34bda1ac7382f8cba210ee325e07597e.zip | |
Fix bug automerge cannot be chosed when there is only 1 merge style (#33040)
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
auto-merge.
Fix #32448
| -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 e8bcee70db..bafeec6c97 100644 --- a/web_src/js/components/PullRequestMergeForm.vue +++ b/web_src/js/components/PullRequestMergeForm.vue @@ -147,7 +147,7 @@ function clearMergeMessage() { </template> </span> </button> - <div class="ui dropdown icon button" @click.stop="showMergeStyleMenu = !showMergeStyleMenu" v-if="mergeStyleAllowedCount>1"> + <div class="ui dropdown icon button" @click.stop="showMergeStyleMenu = !showMergeStyleMenu"> <svg-icon name="octicon-triangle-down" :size="14"/> <div class="menu" :class="{'show':showMergeStyleMenu}"> <template v-for="msd in mergeForm.mergeStyles"> |