Fixes a potential error state

If `MergeWorker` is run twice, this could show a "Merge Request is not mergeable" error.

Fixes a potential error state
If `MergeWorker` is run twice, this could show a "Merge Request is not mergeable" error.
de029359 · Gary Holtz · ab3578fb · de029359
Commit de029359 authored Mar 30, 2020 by Gary Holtz
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

app/services/merge_requests/merge_service.rb app/services/merge_requests/merge_service.rb +0 -2

No files found.
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -55,8 +55,6 @@ module MergeRequests
      error =
        if @merge_request.should_be_rebased?
          'Only fast-forward merge is allowed for your project. Please update your source branch'
-        elsif !@merge_request.merged? && !@merge_request.mergeable?
-          'Merge request is not mergeable'
        end

      raise_error(error) if error