Skip to content

Commit a50156d

Browse files
committed
Merge BitbucketServer PRs from the Launchpad
(#4107, #4146)
1 parent 41cb644 commit a50156d

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
@@ -261,6 +261,7 @@ export type MergePullRequestFn =
261261
headRef: {
262262
oid: string | null;
263263
} | null;
264+
version?: number; // Used by BitbucketServer
264265
} & SetPullRequestInput;
265266
mergeStrategy?: GitMergeStrategy;
266267
},
@@ -1007,6 +1008,7 @@ export function fromProviderPullRequest(
10071008
? fromProviderBuildStatusState[pr.headCommit.buildStatuses[0].state]
10081009
: undefined,
10091010
options?.project,
1011+
pr.version,
10101012
);
10111013
}
10121014

src/plus/integrations/providers/providersApi.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -844,6 +844,7 @@ export class ProvidersApi {
844844
login: pr.repository.owner,
845845
},
846846
},
847+
version: pr.version,
847848
},
848849
...options,
849850
},

0 commit comments

Comments
 (0)