diff options
| author | Tony Gambone <tonygambone@gmail.com> | 2016-09-22 17:30:37 -0400 |
|---|---|---|
| committer | Tony Gambone <tonygambone@gmail.com> | 2016-09-29 14:51:12 -0400 |
| commit | 6d49fcf439c88492ff599432818d1c302e509997 (patch) | |
| tree | a1fc7b977a8c767546005f0561d95ded08bb57f7 /app | |
| parent | 923a1f7ace53f4913284c384ae2a20a39a999f99 (diff) | |
| download | gitlab-ce-6d49fcf439c88492ff599432818d1c302e509997.tar.gz | |
Close todos when accepting a MR via the API.
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) |