Commit 7a7c01b9 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'lock_warning' into 'master'

Rename MergeRequest#lock! to #lock_mr!
parents 024e0577 b5007c15
......@@ -62,11 +62,11 @@ class MergeRequest < ActiveRecord::Base
transition closed: :reopened
end
event :lock do
event :lock_mr do
transition [:reopened, :opened] => :locked
end
event :unlock do
event :unlock_mr do
transition locked: :reopened
end
......
......@@ -6,7 +6,7 @@ module MergeRequests
# Called when you do merge via GitLab UI
class AutoMergeService < BaseMergeService
def execute(merge_request, current_user, commit_message)
merge_request.lock
merge_request.lock_mr
if Gitlab::Satellite::MergeAction.new(current_user, merge_request).merge!(commit_message)
merge_request.merge
......@@ -17,11 +17,11 @@ module MergeRequests
true
else
merge_request.unlock
merge_request.unlock_mr
false
end
rescue
merge_request.unlock if merge_request.locked?
merge_request.unlock_mr if merge_request.locked?
merge_request.mark_as_unmergeable
false
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