diff options
author | Robert Speicher <robert@gitlab.com> | 2015-10-19 12:31:11 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2015-10-19 12:31:11 +0300 |
commit | c9edffcba6443d2bf72cfa6dda15fd53c106657b (patch) | |
tree | e2bdb26a0c272f4d19e73df1c2e526b6f83879fa /app | |
parent | a148c06cf8cba7d34929e4517180c952328964e9 (diff) | |
parent | d12e49c5916a42dafba32555405878f32c7ad254 (diff) |
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
Diffstat (limited to 'app')
-rw-r--r-- | app/services/merge_requests/post_merge_service.rb | 10 |
1 files changed, 10 insertions, 0 deletions
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 |