diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-11-28 11:26:55 -0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-11-28 11:26:55 -0200 |
| commit | 200e14e853fbcf2333667cd122c8afb4dcdd612e (patch) | |
| tree | dedf823bb9b2ff4fa5e9aa0aa2bb688f685ef67f | |
| parent | 97968f31f88188345d92e420a84826e58c984682 (diff) | |
| download | gitlab-ce-200e14e853fbcf2333667cd122c8afb4dcdd612e.tar.gz | |
Fix merge_requests/base_service.rb conflict
| -rw-r--r-- | app/services/merge_requests/base_service.rb | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index 41d2cdec24f..112606a82d7 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -4,7 +4,6 @@ module MergeRequests SystemNoteService.change_status(merge_request, merge_request.target_project, current_user, state, nil) end -<<<<<<< HEAD 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? @@ -21,10 +20,6 @@ module MergeRequests def hook_data(merge_request, action, old_rev: nil, old_labels: [], old_assignees: []) hook_data = merge_request.to_hook_data(current_user, old_labels: old_labels, old_assignees: old_assignees) -======= - 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) ->>>>>>> c4d844f08b... Merge branch 'issue_40374' into 'master' hook_data[:object_attributes][:action] = action if old_rev && !Gitlab::Git.blank_ref?(old_rev) hook_data[:object_attributes][:oldrev] = old_rev |