diff --git a/src/github/activityBarViewProvider.ts b/src/github/activityBarViewProvider.ts index 1905c6821c..be1ddf19e8 100644 --- a/src/github/activityBarViewProvider.ts +++ b/src/github/activityBarViewProvider.ts @@ -200,10 +200,11 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W pullRequestModel.canEdit(), pullRequestModel.validateDraftMode(), pullRequestModel.getCoAuthors(), - ensureEmojis(this._folderRepositoryManager.context) + this._folderRepositoryManager.mergeQueueMethodForBranch(pullRequestModel.base.ref, pullRequestModel.remote.owner, pullRequestModel.remote.repositoryName), + ensureEmojis(this._folderRepositoryManager.context), ]); this._updatingPromise = updatingPromise; - const [pullRequest, repositoryAccess, timelineEvents, requestedReviewers, branchInfo, defaultBranch, currentUser, viewerCanEdit, hasReviewDraft, coAuthors] = await updatingPromise; + const [pullRequest, repositoryAccess, timelineEvents, requestedReviewers, branchInfo, defaultBranch, currentUser, viewerCanEdit, hasReviewDraft, coAuthors, mergeQueueMethod] = await updatingPromise; if (!pullRequest) { throw new Error( @@ -285,6 +286,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W events: timelineEvents, mergeMethodsAvailability, defaultMergeMethod, + mergeQueueMethod, repositoryDefaultBranch: defaultBranch, doneCheckoutBranch, isIssue: false, diff --git a/src/github/pullRequestOverview.ts b/src/github/pullRequestOverview.ts index f28d93e289..bc32c492ed 100644 --- a/src/github/pullRequestOverview.ts +++ b/src/github/pullRequestOverview.ts @@ -356,7 +356,7 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel { }; export const MergeSimple = (pr: PullRequest) => { - const { merge, updatePR } = useContext(PullRequestContext); + const { merge, updatePR, enqueue } = useContext(PullRequestContext); + + if (pr.mergeQueueMethod) { + return
+ +
; + } + async function submitAction(selected: MergeMethod): Promise { const newContext = await merge({ title: '',