Skip to content
Snippets Groups Projects
Commit d7f61bae authored by Oswaldo Ferreir's avatar Oswaldo Ferreir
Browse files

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
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -819,7 +819,7 @@ class MergeRequest < ActiveRecord::Base
lock_mr
yield
ensure
unlock_mr if locked?
unlock_mr
end
end
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment