Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug automerge cannot be chosed when there is only 1 merge style #33040

Merged
merged 3 commits into from
Dec 30, 2024
Merged

Fix bug automerge cannot be chosed when there is only 1 merge style #33040

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d2ffd7
Fix bug automerge cannot be chosed when there is only 1 merge style
lunny Dec 30, 2024
63587b3
Merge branch 'main' into lunny/allow_automerge_only_1_mergestyle
GiteaBot Dec 30, 2024
2d70a13
Merge branch 'main' into lunny/allow_automerge_only_1_mergestyle
GiteaBot Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web_src/js/components/PullRequestMergeForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Loading