Merge pull request #37 from stalar/master

Allow merges if pr.mergeable_state == 'has_hooks'
jhaals · Sep 3, 2018 · 3e8a02c · 3e8a02c
2 parents a8693df + 9988957
commit 3e8a02c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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.\n\n" +
         'If the pr is already merged according to github, you can ignore this message.'