diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-10-19 09:31:11 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-10-19 11:33:17 +0200 |
| commit | ba6583e0ce29b1a0b31892a7e2914af2a4cc9a95 (patch) | |
| tree | e5e1629a6955dab061decdcb135a2401806010ca | |
| parent | 5707aaf3972c578423382d9bdd83dd0957273ea6 (diff) | |
| download | gitlab-ce-ba6583e0ce29b1a0b31892a7e2914af2a4cc9a95.tar.gz | |
Merge branch 'close-issues-by-mr' into 'master'
Close issues mentioned in MR description when MR is merged using
fast-forward merge or when merge commit message is edited.
Fixes gitlab-org/gitlab-ee#48.
See merge request !1639
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/services/merge_requests/post_merge_service.rb | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 037298e582d..d82ba50f406 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,8 @@ 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 - Add a system note and update relevant merge requests when a branch is deleted or re-added (Stan Hu) 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 |