summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2019-06-18 19:13:26 +0200
committerAchilleas Pipinellis <axil@gitlab.com>2019-06-18 19:13:26 +0200
commit0088b74100cd141b6f172376c7fb77868945b37f (patch)
treedd6e9b0d49bb1f0281826ac047b9212e89fc7585
parentae9b499306799fd72d3b628567860161e1e0676a (diff)
downloadgitlab-ce-danger-comply-with-suggestions.tar.gz
-rw-r--r--danger/commit_messages/Dangerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/danger/commit_messages/Dangerfile b/danger/commit_messages/Dangerfile
index 367f55d2fcc..ec494635f02 100644
--- a/danger/commit_messages/Dangerfile
+++ b/danger/commit_messages/Dangerfile
@@ -80,7 +80,7 @@ def unicode_emoji_regex
))x
end
-def lint_commit(commit)
+def lint_commit(commit) # rubocop:disable Metrics/AbcSize
# For now we'll ignore merge commits, as getting rid of those is a problem
# separate from enforcing good commit messages.
return false if commit.message.start_with?('Merge branch')
@@ -115,7 +115,7 @@ def lint_commit(commit)
end
# Fail if a suggestion commit is used and squash is not enabled
- if commit.message.start_with?('Apply suggestion to') && !gitlab.mr_json['squash'] # rubocop:disable Metrics/AbcSize
+ if commit.message.start_with?('Apply suggestion to') && !gitlab.mr_json['squash']
fail_commit(
commit,
'If you are applying suggestions, squash needs to be enabled in the merge request'