USEFULL
/
drone
mirror of https://github.com/harness/drone.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: [CODE-2903]: Disable the inline merge btn - in case the merge is in progress (#3121) 

* 

fix: [CODE-2903]: Disable the inline merge btn - in case the merge is in progress
pull/3597/head
Ritik Kapoor 2024-12-06 10:40:00 +00:00 committed by Harness
parent f82dd44d57
commit 3f608cd3db
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -494,7 +494,9 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
type="submit" type="submit"
onClick={handleSubmit} onClick={handleSubmit}
disabled={ disabled={
isMerged || (mergeOption.method === MergeStrategy.FAST_FORWARD && rebasePossible) (loading && !internalFlags.current.dryRun) ||
isMerged ||
(mergeOption.method === MergeStrategy.FAST_FORWARD && rebasePossible)
} }
variation={ButtonVariation.PRIMARY} variation={ButtonVariation.PRIMARY}
text={getString('confirmStrat', { strat: mergeOption.title })} text={getString('confirmStrat', { strat: mergeOption.title })}