diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-24 09:38:45 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-11-24 09:38:45 +0000 |
| commit | c4d844f08b99a5251f0d3cea7a493cb3480d5626 (patch) | |
| tree | 8daa3c05bfa562c8e8dff93bc44c3ae38e943362 /app/services/merge_requests | |
| parent | 3dd5bedb54ce1bb150ab5304463c0a63d6e10ec9 (diff) | |
| parent | 5c2c471a835f9588e39ec11fa79571c8b44979f8 (diff) | |
| download | gitlab-ce-c4d844f08b99a5251f0d3cea7a493cb3480d5626.tar.gz | |
Merge branch 'issue_40374' into 'master'
Fix WIP system note not being created
Closes #40374
See merge request gitlab-org/gitlab-ce!15528
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/base_service.rb | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index d3938b065bc..f6ffd48deae 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -4,20 +4,6 @@ module MergeRequests SystemNoteService.change_status(merge_request, merge_request.target_project, current_user, state, nil) end - def create_title_change_note(issuable, old_title) - removed_wip = MergeRequest.work_in_progress?(old_title) && !issuable.work_in_progress? - added_wip = !MergeRequest.work_in_progress?(old_title) && issuable.work_in_progress? - changed_title = MergeRequest.wipless_title(old_title) != issuable.wipless_title - - if removed_wip - SystemNoteService.remove_merge_request_wip(issuable, issuable.project, current_user) - elsif added_wip - SystemNoteService.add_merge_request_wip(issuable, issuable.project, current_user) - end - - super if changed_title - end - def hook_data(merge_request, action, old_rev: nil, old_labels: [], old_assignees: [], old_total_time_spent: nil) hook_data = merge_request.to_hook_data(current_user, old_labels: old_labels, old_assignees: old_assignees, old_total_time_spent: old_total_time_spent) hook_data[:object_attributes][:action] = action |