diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-30 08:50:40 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-30 08:50:40 +0000 |
| commit | dde96231833e9b4673cd04686953205b2105416d (patch) | |
| tree | def7b9271820333474303e3f08f3693a1a432e81 /app | |
| parent | db00b495d2099e869f50694a0c156632e5b77561 (diff) | |
| parent | 6d49fcf439c88492ff599432818d1c302e509997 (diff) | |
| download | gitlab-ce-dde96231833e9b4673cd04686953205b2105416d.tar.gz | |
Merge branch 'mr_api_todo_close' into 'master'
Closes todos for a merge request when the MR is accepted via the API by the MR assignee.
## Are there points in the code the reviewer needs to double check?
Please review refresh service test changes to see if they are correct - I think in those cases, the todos should actually be cleared instead of left pending.
## Why was this MR needed?
To make the API behavior consistent with the UI behavior (accepting your own MRs closes the todo item and prevents them from piling up).
Closes #22477
See merge request !6486
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 | ||||
| -rw-r--r-- | app/services/merge_requests/post_merge_service.rb | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 935417d4ae8..020a21ddf93 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -308,8 +308,6 @@ class Projects::MergeRequestsController < Projects::ApplicationController return end - TodoService.new.merge_merge_request(merge_request, current_user) - @merge_request.update(merge_error: nil) if params[:merge_when_build_succeeds].present? diff --git a/app/services/merge_requests/post_merge_service.rb b/app/services/merge_requests/post_merge_service.rb index 8437d9b8b43..e8fb1b59752 100644 --- a/app/services/merge_requests/post_merge_service.rb +++ b/app/services/merge_requests/post_merge_service.rb @@ -7,6 +7,7 @@ module MergeRequests class PostMergeService < MergeRequests::BaseService def execute(merge_request) close_issues(merge_request) + todo_service.merge_merge_request(merge_request, current_user) merge_request.mark_as_merged create_merge_event(merge_request, current_user) create_note(merge_request) |