Commit 9fa498f0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Skip rebase if another in progress

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent b6e06124
......@@ -23,6 +23,11 @@ module MergeRequests
def rebase
Gitlab::ShellEnv.set_env(current_user)
if merge_request.rebase_in_progress?
log('Rebase task canceled: Another rebase is already in progress')
return false
end
# Clone
output, status = popen(%W(git clone -b #{merge_request.source_branch} -- #{source_project.repository.path_to_repo} #{tree_path}))
......
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