diff options
| author | Paul Charlton <techguru@byiq.com> | 2017-07-11 09:23:51 +0300 |
|---|---|---|
| committer | Paul Charlton <techguru@byiq.com> | 2017-07-11 09:23:51 +0300 |
| commit | 65eca13f7b6a93b54267f82e4c66a5f9bab69dc1 (patch) | |
| tree | 109f3170ff776407d5e947c2e8ebc317c62833fb /app/services/milestones | |
| parent | 0b434daf52cb93ea42cb49ce15aa59dd01599181 (diff) | |
Repair Regression caused by - !11573
some changes introduced by 4daa6da5407d235cbe4f7a787eaa29304446a870, 26b6e299e1c97b956306572c5c9f6c02f428bfd7, 17898ce021fc365c620d4600df68c3e7d2151619 were regressed during today's merge conflict resolution of !11573.
This commit serves to reapply those changes.
/cc: @rspeicher @stanhu @mikegreiling
Diffstat (limited to 'app/services/milestones')
| -rw-r--r-- | app/services/milestones/destroy_service.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/services/milestones/destroy_service.rb b/app/services/milestones/destroy_service.rb index e457212508f..600ebcfbecb 100644 --- a/app/services/milestones/destroy_service.rb +++ b/app/services/milestones/destroy_service.rb @@ -1,15 +1,17 @@ module Milestones class DestroyService < Milestones::BaseService def execute(milestone) + return unless milestone.is_project_milestone? + Milestone.transaction do update_params = { milestone: nil } milestone.issues.each do |issue| - Issues::UpdateService.new(project, current_user, update_params).execute(issue) + Issues::UpdateService.new(parent, 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) + MergeRequests::UpdateService.new(parent, current_user, update_params).execute(merge_request) end event_service.destroy_milestone(milestone, current_user) |