File tree 2 files changed +12
-4
lines changed
src/plus/integrations/providers
2 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -35,13 +35,17 @@ export class BitbucketIntegration extends HostingIntegration<
35
35
}
36
36
37
37
protected override async mergeProviderPullRequest (
38
- _session : AuthenticationSession ,
39
- _pr : PullRequest ,
40
- _options ?: {
38
+ { accessToken } : AuthenticationSession ,
39
+ pr : PullRequest ,
40
+ options ?: {
41
41
mergeMethod ?: PullRequestMergeMethod ;
42
42
} ,
43
43
) : Promise < boolean > {
44
- return Promise . resolve ( false ) ;
44
+ const api = await this . getProvidersApi ( ) ;
45
+ return api . mergePullRequest ( this . id , pr , {
46
+ accessToken : accessToken ,
47
+ mergeMethod : options ?. mergeMethod ,
48
+ } ) ;
45
49
}
46
50
47
51
protected override async getProviderAccountForCommit (
Original file line number Diff line number Diff line change @@ -36,6 +36,7 @@ import type {
36
36
GetReposForAzureProjectFn ,
37
37
GetReposOptions ,
38
38
IssueFilter ,
39
+ MergePullRequestFn ,
39
40
PageInfo ,
40
41
PagingMode ,
41
42
ProviderAccount ,
@@ -207,6 +208,9 @@ export class ProvidersApi {
207
208
getPullRequestsForRepoFn : providerApis . bitbucket . getPullRequestsForRepo . bind (
208
209
providerApis . bitbucket ,
209
210
) as GetPullRequestsForRepoFn ,
211
+ mergePullRequestFn : providerApis . bitbucket . mergePullRequest . bind (
212
+ providerApis . bitbucket ,
213
+ ) as MergePullRequestFn ,
210
214
} ,
211
215
[ HostingIntegrationId . AzureDevOps ] : {
212
216
...providersMetadata [ HostingIntegrationId . AzureDevOps ] ,
You can’t perform that action at this time.
0 commit comments