github/drone
5
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-21 19:39:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: [code-970]: add commitsha to merge api (#766)

Browse Source
This commit is contained in:
Calvin Lee 2023-11-03 17:40:11 +00:00 committed by Harness
parent db7655c569
commit afb21a3ca3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,7 +314,10 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
{...permissionProps(permPushResult, standalone)} {...permissionProps(permPushResult, standalone)}
onClick={async () => { onClick={async () => {
if (mergeOption.method !== 'close') { if (mergeOption.method !== 'close') {
const payload: OpenapiMergePullReq = { method: mergeOption.method } const payload: OpenapiMergePullReq = {
method: mergeOption.method,
source_sha: pullRequestMetadata?.source_sha
}
mergePR(payload) mergePR(payload)
.then(onPRStateChanged) .then(onPRStateChanged)
.catch(exception => showError(getErrorMessage(exception))) .catch(exception => showError(getErrorMessage(exception)))