Skip to content

Commit b99371e

Browse files
committed
build: replace ng-dev MergeConfig wiith PullRequestConfig
More info: angular/dev-infra@c3f5729
1 parent 5adfad3 commit b99371e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.ng-dev/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export { commitMessage } from './commit-message';
22
export { format } from './format';
33
export { github } from './github';
4-
export { merge } from './merge';
4+
export { pullRequest } from './pull-request';
55
export { release } from './release';

.ng-dev/merge.ts renamed to .ng-dev/pull-request.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { MergeConfig } from '@angular/dev-infra-private/ng-dev/pr/merge/config';
1+
import { PullRequestConfig } from '@angular/dev-infra-private/ng-dev/pr/config';
22

33
/**
44
* Configuration for the merge tool in `ng-dev`. This sets up the labels which
55
* are respected by the merge script (e.g. the target labels).
66
*/
7-
export const merge: MergeConfig = {
7+
export const pullRequest: PullRequestConfig = {
88
githubApiMerge: {
99
default: 'rebase',
1010
labels: [{ pattern: 'squash commits', method: 'squash' }],

0 commit comments

Comments
 (0)