diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 12:28:36 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-01 12:28:36 +0300 |
| commit | 82f19211659270b29881160840f1352ed17f9dbe (patch) | |
| tree | 551900344649d891155ac69adfa6797d8f25b5ca /app/services | |
| parent | 58036d6847f545b51583a90737d86fa1baea3d4c (diff) | |
| parent | 05fdd12fd984ffee0b2c9be3821fbc9a67abc6d4 (diff) | |
Merge branch 'mr_improve_errors_handling'
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/merge_requests/merge_service.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/services/merge_requests/merge_service.rb b/app/services/merge_requests/merge_service.rb index 98a67c0bc99..fcc0f2a6a8d 100644 --- a/app/services/merge_requests/merge_service.rb +++ b/app/services/merge_requests/merge_service.rb @@ -38,6 +38,10 @@ module MergeRequests } repository.merge(current_user, merge_request.source_sha, merge_request.target_branch, options) + rescue Exception => e + merge_request.update(merge_error: "Something went wrong during merge") + Rails.logger.error(e.message) + return false end def after_merge |