Commit d7f61bae authored by Oswaldo Ferreira's avatar Oswaldo Ferreira

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).
parent 6f0f65be
...@@ -819,7 +819,7 @@ class MergeRequest < ActiveRecord::Base ...@@ -819,7 +819,7 @@ class MergeRequest < ActiveRecord::Base
lock_mr lock_mr
yield yield
ensure ensure
unlock_mr if locked? unlock_mr
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment