4603e57147
Similar to423d2d6, except duplicates occurred only if a Web service (e.g. Slack) were configured. When deleting a branch, this is what was happening: 1. DeleteBranchService calls execute_hooks and execute_services 2. The call to repository.rm_branch triggers the GitHooksService. 3. This, in turn, calls GitPushService and then calls the same hooks/services again.5145706now makes it no longer necessary for DeleteBranchService and CreateBranchService to execute the branch hooks/services. Note that tags behave differently in GitTagPushService and GitPushService is not called. Closes #10330
53 lines
1.4 KiB
Ruby
53 lines
1.4 KiB
Ruby
require_relative 'base_service'
|
|
|
|
class DeleteBranchService < BaseService
|
|
def execute(branch_name)
|
|
repository = project.repository
|
|
branch = repository.find_branch(branch_name)
|
|
|
|
# No such branch
|
|
unless branch
|
|
return error('No such branch', 404)
|
|
end
|
|
|
|
if branch_name == repository.root_ref
|
|
return error('Cannot remove HEAD branch', 405)
|
|
end
|
|
|
|
# Dont allow remove of protected branch
|
|
if project.protected_branch?(branch_name)
|
|
return error('Protected branch cant be removed', 405)
|
|
end
|
|
|
|
# Dont allow user to remove branch if he is not allowed to push
|
|
unless current_user.can?(:push_code, project)
|
|
return error('You dont have push access to repo', 405)
|
|
end
|
|
|
|
if repository.rm_branch(current_user, branch_name)
|
|
# GitPushService handles execution of services and hooks for branch pushes
|
|
success('Branch was removed')
|
|
else
|
|
error('Failed to remove branch')
|
|
end
|
|
rescue GitHooksService::PreReceiveError
|
|
error('Branch deletion was rejected by Git hook')
|
|
end
|
|
|
|
def error(message, return_code = 400)
|
|
out = super(message)
|
|
out[:return_code] = return_code
|
|
out
|
|
end
|
|
|
|
def success(message)
|
|
out = super()
|
|
out[:message] = message
|
|
out
|
|
end
|
|
|
|
def build_push_data(branch)
|
|
Gitlab::PushDataBuilder
|
|
.build(project, current_user, branch.target, Gitlab::Git::BLANK_SHA, "#{Gitlab::Git::BRANCH_REF_PREFIX}#{branch.name}", [])
|
|
end
|
|
end
|