diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-18 12:45:46 +0300 |
commit | a7b3560714b4d9cc4ab32dffcd1f74a284b93580 (patch) | |
tree | 7452bd5c3545c2fa67a28aa013835fb4fa071baf /app/services/issues/update_service.rb | |
parent | ee9173579ae56a3dbfe5afe9f9410c65bb327ca7 (diff) |
Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42
Diffstat (limited to 'app/services/issues/update_service.rb')
-rw-r--r-- | app/services/issues/update_service.rb | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb index aecb22453b7..8372cd919e5 100644 --- a/app/services/issues/update_service.rb +++ b/app/services/issues/update_service.rb @@ -2,8 +2,6 @@ module Issues class UpdateService < Issues::BaseService - extend ::Gitlab::Utils::Override - # NOTE: For Issues::UpdateService, we default the spam_params to nil, because spam_checking is not # necessary in many cases, and we don't want to require every caller to explicitly pass it as nil # to disable spam checking. @@ -92,18 +90,6 @@ module Issues todo_service.update_issue(issuable, current_user) end - def handle_move_between_ids(issue) - issue.check_repositioning_allowed! if params[:move_between_ids] - - super - - rebalance_if_needed(issue) - end - - def positioning_scope_key - :board_group_id - end - # rubocop: disable CodeReuse/ActiveRecord def change_issue_duplicate(issue) canonical_issue_id = params.delete(:canonical_issue_id) @@ -214,23 +200,12 @@ module Issues return unless old_escalation_status.present? return if issue.escalation_status&.slice(:status, :policy_id) == old_escalation_status - ::IncidentManagement::IssuableEscalationStatuses::AfterUpdateService.new(issue, current_user).execute - end - - # rubocop: disable CodeReuse/ActiveRecord - def issuable_for_positioning(id, board_group_id = nil) - return unless id - - issue = - if board_group_id - IssuesFinder.new(current_user, group_id: board_group_id, include_subgroups: true).find_by(id: id) - else - project.issues.find(id) - end - - issue if can?(current_user, :update_issue, issue) + ::IncidentManagement::IssuableEscalationStatuses::AfterUpdateService.new( + issue, + current_user, + status_change_reason: @escalation_status_change_reason # Defined in IssuableBaseService before save + ).execute end - # rubocop: enable CodeReuse/ActiveRecord def create_confidentiality_note(issue) SystemNoteService.change_issue_confidentiality(issue, issue.project, current_user) |