summaryrefslogtreecommitdiff
path: root/app/services/delete_branch_service.rb
diff options
context:
space:
mode:
authorValery Sizov <valery@gitlab.com>2016-07-04 15:30:22 +0300
committerValery Sizov <valery@gitlab.com>2016-07-04 15:31:49 +0300
commitbf218337ed5bd535856204ef1878a1495fa37dfe (patch)
tree66415495c994a17fb0c45bcfcb4a3d08d808098f /app/services/delete_branch_service.rb
parent021b6aef94b3398ab5603b4c11afd4c6d8432795 (diff)
downloadgitlab-ce-bf218337ed5bd535856204ef1878a1495fa37dfe.tar.gz
Better message for git hooks and file locks
Diffstat (limited to 'app/services/delete_branch_service.rb')
-rw-r--r--app/services/delete_branch_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/delete_branch_service.rb b/app/services/delete_branch_service.rb
index fae069ee4a5..752a7029952 100644
--- a/app/services/delete_branch_service.rb
+++ b/app/services/delete_branch_service.rb
@@ -30,8 +30,8 @@ class DeleteBranchService < BaseService
else
error('Failed to remove branch')
end
- rescue GitHooksService::PreReceiveError
- error('Branch deletion was rejected by Git hook')
+ rescue GitHooksService::PreReceiveError => ex
+ error(ex.message)
end
def error(message, return_code = 400)