Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ignore bitbucket's automatic merge commit in PR builds #573

Merged
merged 1 commit into from
Feb 9, 2019
Merged

Ignore bitbucket's automatic merge commit in PR builds #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion @commitlint/is-ignored/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const WILDCARDS = [
),
c => c.match(/^Merged (.*?)(in|into) (.*)/),
c => c.match(/^Merge remote-tracking branch (.*)/),
c => c.match(/^Automatic merge from (.*)/),
c => c.match(/^Automatic merge(.*)/),
c => c.match(/^Auto-merged (.*?) into (.*)/)
];

Expand Down
1 change: 1 addition & 0 deletions @commitlint/is-ignored/src/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ test('should return true for bitbucket merge commits', t => {
isIgnored('Merged in feature/facebook-friends-sync (pull request #8)')
);
t.true(isIgnored('Merged develop into feature/component-form-select-card'));
t.true(isIgnored('Automatic merge'));
});

test('should return true for automatic merge commits', t => {
Expand Down