2018-07-17 12:50:37 -04:00
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2014-04-02 14:51:17 -04:00
|
|
|
module MergeRequests
|
|
|
|
class UpdateService < MergeRequests::BaseService
|
2020-06-29 11:08:56 -04:00
|
|
|
extend ::Gitlab::Utils::Override
|
|
|
|
|
2014-04-02 14:51:17 -04:00
|
|
|
def execute(merge_request)
|
2015-05-29 12:40:35 -04:00
|
|
|
# We don't allow change of source/target projects and source branch
|
2014-04-02 14:51:17 -04:00
|
|
|
# after merge request was created
|
2018-12-14 17:58:57 -05:00
|
|
|
params.delete(:source_project_id)
|
|
|
|
params.delete(:target_project_id)
|
|
|
|
params.delete(:source_branch)
|
2014-04-02 14:51:17 -04:00
|
|
|
|
2020-12-08 10:09:45 -05:00
|
|
|
if merge_request.closed_or_merged_without_fork?
|
2018-12-14 17:58:57 -05:00
|
|
|
params.delete(:target_branch)
|
|
|
|
params.delete(:force_remove_source_branch)
|
2016-07-26 07:57:43 -04:00
|
|
|
end
|
|
|
|
|
2019-01-29 19:31:31 -05:00
|
|
|
update_task_event(merge_request) || update(merge_request)
|
2015-11-12 18:06:42 -05:00
|
|
|
end
|
2014-06-10 05:33:17 -04:00
|
|
|
|
2017-05-04 08:11:15 -04:00
|
|
|
def handle_changes(merge_request, options)
|
2017-11-21 12:13:07 -05:00
|
|
|
old_associations = options.fetch(:old_associations, {})
|
|
|
|
old_labels = old_associations.fetch(:labels, [])
|
|
|
|
old_mentioned_users = old_associations.fetch(:mentioned_users, [])
|
2019-04-07 14:35:16 -04:00
|
|
|
old_assignees = old_associations.fetch(:assignees, [])
|
2020-09-09 08:08:22 -04:00
|
|
|
old_reviewers = old_associations.fetch(:reviewers, [])
|
2017-05-04 08:11:15 -04:00
|
|
|
|
2020-09-09 08:08:22 -04:00
|
|
|
if has_changes?(merge_request, old_labels: old_labels, old_assignees: old_assignees, old_reviewers: old_reviewers)
|
2020-05-28 14:08:37 -04:00
|
|
|
todo_service.resolve_todos_for_target(merge_request, current_user)
|
2016-02-18 16:12:52 -05:00
|
|
|
end
|
|
|
|
|
|
|
|
if merge_request.previous_changes.include?('title') ||
|
2016-12-15 17:14:20 -05:00
|
|
|
merge_request.previous_changes.include?('description')
|
2017-03-28 02:25:43 -04:00
|
|
|
todo_service.update_merge_request(merge_request, current_user, old_mentioned_users)
|
2016-02-16 18:18:38 -05:00
|
|
|
end
|
|
|
|
|
2015-11-12 18:06:42 -05:00
|
|
|
if merge_request.previous_changes.include?('target_branch')
|
|
|
|
create_branch_change_note(merge_request, 'target',
|
|
|
|
merge_request.previous_changes['target_branch'].first,
|
|
|
|
merge_request.target_branch)
|
2019-06-10 07:10:02 -04:00
|
|
|
|
2019-06-26 08:24:09 -04:00
|
|
|
abort_auto_merge(merge_request, 'target branch was changed')
|
2015-11-12 18:06:42 -05:00
|
|
|
end
|
2014-04-02 14:51:17 -04:00
|
|
|
|
2020-03-10 11:08:08 -04:00
|
|
|
handle_assignees_change(merge_request, old_assignees) if merge_request.assignees != old_assignees
|
2015-05-28 21:00:37 -04:00
|
|
|
|
2020-09-09 08:08:22 -04:00
|
|
|
handle_reviewers_change(merge_request, old_reviewers) if merge_request.reviewers != old_reviewers
|
|
|
|
|
2015-11-12 18:06:42 -05:00
|
|
|
if merge_request.previous_changes.include?('target_branch') ||
|
|
|
|
merge_request.previous_changes.include?('source_branch')
|
|
|
|
merge_request.mark_as_unchecked
|
|
|
|
end
|
2016-02-12 09:58:39 -05:00
|
|
|
|
2018-11-02 12:29:32 -04:00
|
|
|
handle_milestone_change(merge_request)
|
|
|
|
|
2016-03-01 11:33:13 -05:00
|
|
|
added_labels = merge_request.labels - old_labels
|
|
|
|
if added_labels.present?
|
2018-04-20 13:37:38 -04:00
|
|
|
notification_service.async.relabeled_merge_request(
|
2016-03-01 11:33:13 -05:00
|
|
|
merge_request,
|
|
|
|
added_labels,
|
|
|
|
current_user
|
|
|
|
)
|
2016-02-12 09:58:39 -05:00
|
|
|
end
|
2016-08-15 07:05:08 -04:00
|
|
|
|
2019-10-11 14:06:15 -04:00
|
|
|
added_mentions = merge_request.mentioned_users(current_user) - old_mentioned_users
|
|
|
|
|
2016-08-15 09:47:16 -04:00
|
|
|
if added_mentions.present?
|
2018-04-20 13:37:38 -04:00
|
|
|
notification_service.async.new_mentions_in_merge_request(
|
2016-08-15 09:47:16 -04:00
|
|
|
merge_request,
|
|
|
|
added_mentions,
|
|
|
|
current_user
|
|
|
|
)
|
|
|
|
end
|
2014-04-02 14:51:17 -04:00
|
|
|
end
|
2015-11-17 06:42:43 -05:00
|
|
|
|
2019-01-29 19:31:31 -05:00
|
|
|
def handle_task_changes(merge_request)
|
2020-05-28 14:08:37 -04:00
|
|
|
todo_service.resolve_todos_for_target(merge_request, current_user)
|
2019-01-29 19:31:31 -05:00
|
|
|
todo_service.update_merge_request(merge_request, current_user)
|
|
|
|
end
|
|
|
|
|
2015-11-17 06:42:43 -05:00
|
|
|
def reopen_service
|
|
|
|
MergeRequests::ReopenService
|
|
|
|
end
|
|
|
|
|
|
|
|
def close_service
|
|
|
|
MergeRequests::CloseService
|
|
|
|
end
|
2016-09-20 15:52:20 -04:00
|
|
|
|
|
|
|
def after_update(issuable)
|
|
|
|
issuable.cache_merge_request_closes_issues!(current_user)
|
|
|
|
end
|
2016-09-08 05:18:41 -04:00
|
|
|
|
|
|
|
private
|
|
|
|
|
2018-11-02 12:29:32 -04:00
|
|
|
def handle_milestone_change(merge_request)
|
|
|
|
return if skip_milestone_email
|
|
|
|
|
|
|
|
return unless merge_request.previous_changes.include?('milestone_id')
|
|
|
|
|
|
|
|
if merge_request.milestone.nil?
|
|
|
|
notification_service.async.removed_milestone_merge_request(merge_request, current_user)
|
|
|
|
else
|
|
|
|
notification_service.async.changed_milestone_merge_request(merge_request, merge_request.milestone, current_user)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2020-03-10 11:08:08 -04:00
|
|
|
def handle_assignees_change(merge_request, old_assignees)
|
|
|
|
create_assignee_note(merge_request, old_assignees)
|
|
|
|
notification_service.async.reassigned_merge_request(merge_request, current_user, old_assignees)
|
2020-08-17 05:10:08 -04:00
|
|
|
todo_service.reassigned_assignable(merge_request, current_user, old_assignees)
|
2021-01-28 04:09:07 -05:00
|
|
|
|
|
|
|
new_assignees = merge_request.assignees - old_assignees
|
|
|
|
merge_request_activity_counter.track_users_assigned_to_mr(users: new_assignees)
|
2020-03-10 11:08:08 -04:00
|
|
|
end
|
|
|
|
|
2020-09-09 08:08:22 -04:00
|
|
|
def handle_reviewers_change(merge_request, old_reviewers)
|
2021-01-04 19:10:20 -05:00
|
|
|
affected_reviewers = (old_reviewers + merge_request.reviewers) - (old_reviewers & merge_request.reviewers)
|
2020-09-24 05:09:35 -04:00
|
|
|
create_reviewer_note(merge_request, old_reviewers)
|
2020-09-21 08:09:34 -04:00
|
|
|
notification_service.async.changed_reviewer_of_merge_request(merge_request, current_user, old_reviewers)
|
2020-09-09 08:08:22 -04:00
|
|
|
todo_service.reassigned_reviewable(merge_request, current_user, old_reviewers)
|
2021-01-04 19:10:20 -05:00
|
|
|
invalidate_cache_counts(merge_request, users: affected_reviewers.compact)
|
2021-01-28 04:09:07 -05:00
|
|
|
|
|
|
|
new_reviewers = merge_request.reviewers - old_reviewers
|
|
|
|
merge_request_activity_counter.track_users_review_requested(users: new_reviewers)
|
2020-09-09 08:08:22 -04:00
|
|
|
end
|
|
|
|
|
2017-11-01 13:35:14 -04:00
|
|
|
def create_branch_change_note(issuable, branch_type, old_branch, new_branch)
|
|
|
|
SystemNoteService.change_branch(
|
|
|
|
issuable, issuable.project, current_user, branch_type,
|
|
|
|
old_branch, new_branch)
|
|
|
|
end
|
2020-06-29 11:08:56 -04:00
|
|
|
|
|
|
|
override :handle_quick_actions
|
|
|
|
def handle_quick_actions(merge_request)
|
|
|
|
super
|
2020-12-29 07:10:19 -05:00
|
|
|
|
|
|
|
# Ensure this parameter does not get used as an attribute
|
|
|
|
rebase = params.delete(:rebase)
|
|
|
|
|
|
|
|
if rebase
|
|
|
|
rebase_from_quick_action(merge_request)
|
|
|
|
# Ignore "/merge" if "/rebase" is used to avoid an unexpected race
|
|
|
|
params.delete(:merge)
|
|
|
|
end
|
|
|
|
|
2020-06-29 11:08:56 -04:00
|
|
|
merge_from_quick_action(merge_request) if params[:merge]
|
|
|
|
end
|
|
|
|
|
2020-12-29 07:10:19 -05:00
|
|
|
def rebase_from_quick_action(merge_request)
|
|
|
|
merge_request.rebase_async(current_user.id)
|
|
|
|
end
|
|
|
|
|
2020-06-29 11:08:56 -04:00
|
|
|
def merge_from_quick_action(merge_request)
|
|
|
|
last_diff_sha = params.delete(:merge)
|
|
|
|
|
2020-12-17 13:10:14 -05:00
|
|
|
MergeRequests::MergeOrchestrationService
|
|
|
|
.new(project, current_user, { sha: last_diff_sha })
|
|
|
|
.execute(merge_request)
|
2020-06-29 11:08:56 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
override :quick_action_options
|
|
|
|
def quick_action_options
|
|
|
|
{ merge_request_diff_head_sha: params.delete(:merge_request_diff_head_sha) }
|
|
|
|
end
|
2014-04-02 14:51:17 -04:00
|
|
|
end
|
|
|
|
end
|
2019-09-13 09:26:31 -04:00
|
|
|
|
|
|
|
MergeRequests::UpdateService.prepend_if_ee('EE::MergeRequests::UpdateService')
|