diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-21 19:21:12 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-21 19:21:12 +0300 |
| commit | e0a23791d3cdf7a72e974acc79c3755b35f2da79 (patch) | |
| tree | 0add30bc9404dae7445554f47a6ea5861aad00f4 /app | |
| parent | 39ed04c7b53491ae17713b83cfb8d4c9c4480f9b (diff) | |
| parent | ea5c25bb4ed46decde33c86e618f0b18dd55dae3 (diff) | |
Merge branch 'fix-milestone-destroy-in-mr' into 'master'
Remove milestones from merge requests when milestones are deleted
Destroying a milestone does not remove it from existing merge requests. This MR fixes that.
Requires f4816372 to pull in as well.
Reported by https://github.com/gitlabhq/gitlabhq/issues/9643
See merge request !1348
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/milestones/destroy_service.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/services/milestones/destroy_service.rb b/app/services/milestones/destroy_service.rb index 7ce7d259d0b..2414966505b 100644 --- a/app/services/milestones/destroy_service.rb +++ b/app/services/milestones/destroy_service.rb @@ -4,10 +4,15 @@ module Milestones Milestone.transaction do update_params = { milestone: nil } + milestone.issues.each do |issue| Issues::UpdateService.new(project, current_user, update_params).execute(issue) end + milestone.merge_requests.each do |merge_request| + MergeRequests::UpdateService.new(project, current_user, update_params).execute(merge_request) + end + event_service.destroy_milestone(milestone, current_user) Event.for_milestone_id(milestone.id).each do |event| |