diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-10-01 09:31:48 +0300 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-10-01 09:45:47 +0300 |
| commit | 05fdd12fd984ffee0b2c9be3821fbc9a67abc6d4 (patch) | |
| tree | a9b553865771a2199996c587b38abdc4da9a71ef /app/controllers/projects/merge_requests_controller.rb | |
| parent | 2714d5b8147cef39343a1c35ba099ebe6445f5e4 (diff) | |
| download | gitlab-ce-05fdd12fd984ffee0b2c9be3821fbc9a67abc6d4.tar.gz | |
Improve error message when merging failsmr_improve_errors_handling
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 7574842cd43..7570934e727 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -150,6 +150,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController return access_denied! unless @merge_request.can_be_merged_by?(current_user) if @merge_request.mergeable? + @merge_request.update(merge_error: nil) MergeWorker.perform_async(@merge_request.id, current_user.id, params) @status = true else |