github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-04 13:40:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: [code-2105]: fix available merge strats (#2206)

Browse Source 
* fix: [code-2105]: fix available merge strats
This commit is contained in:
Calvin Lee 2024-07-11 18:00:08 +00:00 committed by Harness
parent 4ac42fc6c9
commit feecde9faa
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
View File

@ -209,7 +209,11 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
if (allowedStrats) {
const matchingMethods = mergeOptions.filter(option => allowedStrats.includes(option.method))
if (matchingMethods.length > 0) {
setMergeOption(mergeOption ? mergeOption : matchingMethods[0])
if (mergeOption && !matchingMethods.includes(mergeOption)) {
setMergeOption(matchingMethods[0])
} else {
setMergeOption(mergeOption)
}
}
} else {
setMergeOption(mergeOptions[3])