From 0388886f9439fa93efea29a159522aec5643f7c8 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 12 Feb 2020 09:09:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- danger/commit_messages/Dangerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'danger') 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 -- cgit v1.2.3