Fix race condition on auto merge

CHANGELOG

@@ -99,6 +99,7 @@ v 8.9.0 (unreleased)
   - Remove tanuki logo from side navigation; center on top nav
   - Include user relationships when retrieving award_emoji
   - Various associations are now eager loaded when parsing issue references to reduce the number of queries executed
+  - Fix race condition on merge when build succeeds
 
 v 8.8.5 (unreleased)
   - Ensure branch cleanup regardless of whether the GitHub import process succeeds

app/controllers/projects/merge_requests_controller.rb

@@ -205,9 +205,18 @@ class Projects::MergeRequestsController < Projects::ApplicationController
     @merge_request.update(merge_error: nil)
 
     if params[:merge_when_build_succeeds].present? && @merge_request.pipeline && @merge_request.pipeline.active?
-      MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
-        .execute(@merge_request)
-      @status = :merge_when_build_succeeds
+      if @merge_request.ci_commit.active?
+        MergeRequests::MergeWhenBuildSucceedsService.new(@project, current_user, merge_params)
+                                                        .execute(@merge_request)
+        @status = :merge_when_build_succeeds
+      # This can be triggered when a user clicks the auto merge button while
+      # the tests finish at about the same time
+      elsif @merge_request.ci_commit.success?
+        MergeWorker.perform_async(@merge_request.id, current_user.id, params)
+        @status = :success
+      else
+        @status = :failed
+      end
     else
       MergeWorker.perform_async(@merge_request.id, current_user.id, params)
       @status = :success