Remove locked? check when unlocking a merge request

Our state machine shall have enough knowledge to not allow states other than locked from transitioning to opened (e.g. MergeRequest#unlock_mr).

Remove locked? check when unlocking a merge request
d7f61bae · Oswaldo Ferreira · 6f0f65be · d7f61bae
Commit d7f61bae authored Aug 10, 2017 by Oswaldo Ferreira
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

merge_request.rb app/models/merge_request.rb +1 -1

No files found.
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -819,7 +819,7 @@ class MergeRequest < ActiveRecord::Base
      lock_mr
      yield
    ensure
-      unlock_mr if locked?
+      unlock_mr
    end
  end