From 9988957f6d3ff239f890024b4367c8387e029b05 Mon Sep 17 00:00:00 2001 From: Staffan Larsen Date: Fri, 6 Jul 2018 14:41:11 +0200 Subject: [PATCH] Allow merges if pr.mergeable_state == 'has_hooks' --- lib/tutter/action/sppuppet.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tutter/action/sppuppet.rb b/lib/tutter/action/sppuppet.rb index 174515f..b50d838 100644 --- a/lib/tutter/action/sppuppet.rb +++ b/lib/tutter/action/sppuppet.rb @@ -134,9 +134,9 @@ def maybe_merge(pull_request_id, merge_command, merger = nil) end end - if pr.mergeable_state != 'clean' && !incident_merge_override - msg = "Merge state for is not clean. Current state: #{pr.mergeable_state}\n" - reassure = "I will try to merge this for you when the builds turn green\n" + + if pr.mergeable_state != 'clean' && pr.mergeable_state != 'has_hooks' && !incident_merge_override + msg = "Merge state is not clean. Current state: #{pr.mergeable_state}\n" + reassure = "I will try to merge this for you when the build turn green\n" + "If your build fails or becomes stuck for some reason, just say 'rebuild'\n" + 'If you have an incident and want to skip the tests or the peer review, please post the link to the jira ticket.' if merge_command