diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 09:09:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-12 09:09:11 +0000 |
| commit | 0388886f9439fa93efea29a159522aec5643f7c8 (patch) | |
| tree | 9a4b2305088e62a9745ce598b45aa34e39e59642 /danger | |
| parent | 8c9dc985b90c353b33cb829caf51f8320171bc15 (diff) | |
| download | gitlab-ce-0388886f9439fa93efea29a159522aec5643f7c8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'danger')
| -rw-r--r-- | danger/commit_messages/Dangerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/danger/commit_messages/Dangerfile b/danger/commit_messages/Dangerfile index d6eb050930c..2db49f60710 100644 --- a/danger/commit_messages/Dangerfile +++ b/danger/commit_messages/Dangerfile @@ -89,9 +89,9 @@ def lint_commits(commits) end if squash_mr? - multi_line_commit_linter = commit_linters.detect { |commit_linter| commit_linter.multi_line? } + multi_line_commit_linter = commit_linters.detect { |commit_linter| !commit_linter.merge? && commit_linter.multi_line? } - if multi_line_commit_linter && multi_line_commit_linter.lint.failed? + if multi_line_commit_linter && multi_line_commit_linter.failed? warn_or_fail_commits(multi_line_commit_linter) fail_message('The commit message that will be used in the squash commit does not meet our Git commit message standards.') else |