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/merge_requests | |
| parent | 8742af1e585593221d99d5345d083734b99adf74 (diff) | |
| download | gitlab-ce-ea8dc107729c06bbc15bfba21dd249611c376a19.tar.gz | |
Don't use Gitlab::Utils.nlbr in Gitlab::Git
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/ff_merge_service.rb | 2 | ||||
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/merge_requests/ff_merge_service.rb b/app/services/merge_requests/ff_merge_service.rb index ba6853b835a..bffc09c34f0 100644 --- a/app/services/merge_requests/ff_merge_service.rb +++ b/app/services/merge_requests/ff_merge_service.rb @@ -13,7 +13,7 @@ module MergeRequests source, merge_request.target_branch, merge_request: merge_request) - rescue Gitlab::Git::HooksService::PreReceiveError => e + rescue Gitlab::Git::PreReceiveError => e raise MergeError, e.message rescue StandardError => e raise MergeError, "Something went wrong during merge: #{e.message}" diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index 126da891c78..3d587f97906 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -79,7 +79,7 @@ module MergeRequests message = params[:commit_message] || merge_request.merge_commit_message repository.merge(current_user, source, merge_request, message) - rescue Gitlab::Git::HooksService::PreReceiveError => e + rescue Gitlab::Git::PreReceiveError => e handle_merge_error(log_message: e.message) raise MergeError, 'Something went wrong during merge pre-receive hook' rescue => e |