Skip to content

Commit f44fe6c

Browse files
committed
Merges BitbucketServer PRs from the Launchpad
(#4107, #4146)
1 parent 4e3ce4b commit f44fe6c

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

src/git/models/pullRequest.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ export class PullRequest implements PullRequestShape {
5757
public readonly assignees?: PullRequestMember[],
5858
public readonly statusCheckRollupState?: PullRequestStatusCheckRollupState,
5959
public readonly project?: IssueProject,
60+
public readonly version?: number,
6061
) {}
6162

6263
get closed(): boolean {

src/plus/integrations/providers/models.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ export type MergePullRequestFn =
260260
headRef: {
261261
oid: string | null;
262262
} | null;
263+
version?: number; // Used by BitbucketServer
263264
} & SetPullRequestInput;
264265
mergeStrategy?: GitMergeStrategy;
265266
},
@@ -992,6 +993,7 @@ export function fromProviderPullRequest(
992993
? fromProviderBuildStatusState[pr.headCommit.buildStatuses[0].state]
993994
: undefined,
994995
options?.project,
996+
pr.version,
995997
);
996998
}
997999

src/plus/integrations/providers/providersApi.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -817,6 +817,7 @@ export class ProvidersApi {
817817
login: pr.repository.owner,
818818
},
819819
},
820+
version: pr.version,
820821
},
821822
...options,
822823
},

0 commit comments

Comments
 (0)