diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-06-11 10:42:09 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-11 10:42:09 +0000 |
| commit | ea8dc107729c06bbc15bfba21dd249611c376a19 (patch) | |
| tree | a4ac618b527519eeb592c20fd8944c8faf5cc8a9 /app/services/delete_branch_service.rb | |
| parent | 8742af1e585593221d99d5345d083734b99adf74 (diff) | |
| download | gitlab-ce-ea8dc107729c06bbc15bfba21dd249611c376a19.tar.gz | |
Don't use Gitlab::Utils.nlbr in Gitlab::Git
Diffstat (limited to 'app/services/delete_branch_service.rb')
| -rw-r--r-- | app/services/delete_branch_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/delete_branch_service.rb b/app/services/delete_branch_service.rb index 1f059c31944..e1499dcee64 100644 --- a/app/services/delete_branch_service.rb +++ b/app/services/delete_branch_service.rb @@ -16,7 +16,7 @@ class DeleteBranchService < BaseService else error('Failed to remove branch') end - rescue Gitlab::Git::HooksService::PreReceiveError => ex + rescue Gitlab::Git::PreReceiveError => ex error(ex.message) end |