diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-24 17:32:17 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-24 17:32:17 +0300 |
| commit | e46a3d2fda47f96885b38c6c6caf7dc3e0df19bd (patch) | |
| tree | 05d362e372d1d84371977fcb8868beffa5fc612f /app/services/merge_requests/merge_service.rb | |
| parent | 88892e43adecd68de7940fdc9856a4557098cb6c (diff) | |
| parent | a1a914994f6376b03d95e9d4b05dea422e8610f9 (diff) | |
Merge branch 'git-operation-user' into 'master'
Move GitHooksService into Gitlab::Git
See merge request !13739
Diffstat (limited to 'app/services/merge_requests/merge_service.rb')
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index bc846e07f24..5be749cd6a0 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -49,7 +49,7 @@ module MergeRequests raise MergeError, 'Conflicts detected during merge' unless commit_id merge_request.update(merge_commit_sha: commit_id) - rescue GitHooksService::PreReceiveError => e + rescue Gitlab::Git::HooksService::PreReceiveError => e raise MergeError, e.message rescue StandardError => e raise MergeError, "Something went wrong during merge: #{e.message}" |