Commit a2c032ca authored by Kerri Miller's avatar Kerri Miller

Extract #resolve_todos method

parent 94b2edff
...@@ -33,9 +33,7 @@ module MergeRequests ...@@ -33,9 +33,7 @@ module MergeRequests
old_reviewers = old_associations.fetch(:reviewers, []) old_reviewers = old_associations.fetch(:reviewers, [])
changed_fields = merge_request.previous_changes.keys changed_fields = merge_request.previous_changes.keys
if has_changes?(merge_request, old_labels: old_labels, old_assignees: old_assignees, old_reviewers: old_reviewers) resolve_todos(merge_request, old_labels, old_assignees, old_reviewers)
todo_service.resolve_todos_for_target(merge_request, current_user)
end
if merge_request.previous_changes.include?('title') || if merge_request.previous_changes.include?('title') ||
merge_request.previous_changes.include?('description') merge_request.previous_changes.include?('description')
...@@ -121,6 +119,12 @@ module MergeRequests ...@@ -121,6 +119,12 @@ module MergeRequests
) )
end end
def resolve_todos(merge_request, old_labels, old_assignees, old_reviewers)
return unless has_changes?(merge_request, old_labels: old_labels, old_assignees: old_assignees, old_reviewers: old_reviewers)
todo_service.resolve_todos_for_target(merge_request, current_user)
end
def handle_target_branch_change(merge_request) def handle_target_branch_change(merge_request)
return unless merge_request.previous_changes.include?('target_branch') return unless merge_request.previous_changes.include?('target_branch')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment