diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 21:08:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-20 21:08:44 +0300 |
| commit | 61b943c213065636abd4ebb34a3fba5412aa047f (patch) | |
| tree | 45bd34aebd141823116ff91b97720c2daedf4814 /app/models/merge_request.rb | |
| parent | 93b6ee78bf98cbc42712b7c5486ab0e78adb339f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index ec97ab0ea42..cd957f445fd 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1507,7 +1507,7 @@ class MergeRequest < ApplicationRecord lock_mr yield ensure - unlock_mr + unlock_mr if locked? end def update_and_mark_in_progress_merge_commit_sha(commit_id) |