diff options
| author | Rubén Dávila <ruben@gitlab.com> | 2015-11-25 19:20:40 -0500 |
|---|---|---|
| committer | Rubén Dávila <ruben@gitlab.com> | 2015-12-03 09:39:15 -0500 |
| commit | 5145706c82613d64462fe736850d09799224cd77 (patch) | |
| tree | 81744d6a01be18d3c89c6cb726f8496777b99e4e /app/services/create_branch_service.rb | |
| parent | b5103a83a8574936721250997e75ab9a6855d00a (diff) | |
| download | gitlab-ce-5145706c82613d64462fe736850d09799224cd77.tar.gz | |
Run custom Git hooks when creating or deleting branches through the UI. #1156
Diffstat (limited to 'app/services/create_branch_service.rb')
| -rw-r--r-- | app/services/create_branch_service.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/services/create_branch_service.rb b/app/services/create_branch_service.rb index cf7ae4345f3..de18f3bc556 100644 --- a/app/services/create_branch_service.rb +++ b/app/services/create_branch_service.rb @@ -13,8 +13,7 @@ class CreateBranchService < BaseService return error('Branch already exists') end - repository.add_branch(branch_name, ref) - new_branch = repository.find_branch(branch_name) + new_branch = repository.add_branch(current_user, branch_name, ref) if new_branch push_data = build_push_data(project, current_user, new_branch) @@ -27,6 +26,8 @@ class CreateBranchService < BaseService else error('Invalid reference name') end + rescue GitHooksService::PreReceiveError + error('Branch creation was rejected by Git hook') end def success(branch) |