diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-18 15:07:02 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-18 15:07:02 +0200 |
| commit | d12e49c5916a42dafba32555405878f32c7ad254 (patch) | |
| tree | afa027cf2808fb7e9cbe2ca490d0023a559e3b43 | |
| parent | 41615ddde4d5ae70bef944d9b156b687af2ca532 (diff) | |
| download | gitlab-ce-close-issues-by-mr.tar.gz | |
Fix bug preventing mentioned issued from being closed when MR is merged using fast-forward merge.close-issues-by-mr
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/services/merge_requests/post_merge_service.rb | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index abf9ead6df7..699b44f00d7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ v 8.2.0 (unreleased) - Highlight comment based on anchor in URL v 8.1.0 (unreleased) + - Fix bug preventing mentioned issued from being closed when MR is merged using fast-forward merge. - Fix nonatomic database update potentially causing project star counts to go negative (Stan Hu) - Fix error preventing displaying of commit data for a directory with a leading dot (Stan Hu) - Speed up load times of issue detail pages by roughly 1.5x diff --git a/app/services/merge_requests/post_merge_service.rb b/app/services/merge_requests/post_merge_service.rb index aceb8cb9021..8f25c5e2496 100644 --- a/app/services/merge_requests/post_merge_service.rb +++ b/app/services/merge_requests/post_merge_service.rb @@ -6,6 +6,7 @@ module MergeRequests # class PostMergeService < MergeRequests::BaseService def execute(merge_request) + close_issues(merge_request) merge_request.mark_as_merged create_merge_event(merge_request, current_user) create_note(merge_request) @@ -15,6 +16,15 @@ module MergeRequests private + def close_issues(merge_request) + return unless merge_request.target_branch == project.default_branch + + closed_issues = merge_request.closes_issues(current_user) + closed_issues.each do |issue| + Issues::CloseService.new(project, current_user, {}).execute(issue, merge_request) + end + end + def create_merge_event(merge_request, current_user) EventCreateService.new.merge_mr(merge_request, current_user) end |