Revert "Fixes a potential error state"

This reverts commit de029359.

Revert "Fixes a potential error state"
This reverts commit de029359.
47825641 · Gary Holtz · de029359 · 47825641
Commit 47825641 authored Mar 31, 2020 by Gary Holtz
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

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

No files found.
--- a/app/services/merge_requests/merge_service.rb
+++ b/app/services/merge_requests/merge_service.rb
@@ -55,6 +55,8 @@ 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