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).
2017-08-10 16:16:43 -03:00 · 2017-08-10 16:16:43 -03:00 · d7f61bae8b
parent 6f0f65becb
commit d7f61bae8b
1 changed files with 1 additions and 1 deletions
--- 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