diff options
Diffstat (limited to 'app/services/issues')
-rw-r--r-- | app/services/issues/build_service.rb | 2 | ||||
-rw-r--r-- | app/services/issues/close_service.rb | 17 | ||||
-rw-r--r-- | app/services/issues/reorder_service.rb | 2 | ||||
-rw-r--r-- | app/services/issues/update_service.rb | 4 |
4 files changed, 21 insertions, 4 deletions
diff --git a/app/services/issues/build_service.rb b/app/services/issues/build_service.rb index e62315de5f9..2de6ed9fa1c 100644 --- a/app/services/issues/build_service.rb +++ b/app/services/issues/build_service.rb @@ -66,7 +66,7 @@ module Issues def whitelisted_issue_params base_params = [:title, :description, :confidential] - admin_params = [:milestone_id] + admin_params = [:milestone_id, :issue_type] if can?(current_user, :admin_issue, project) params.slice(*(base_params + admin_params)) diff --git a/app/services/issues/close_service.rb b/app/services/issues/close_service.rb index 8594808cd44..e431c766df8 100644 --- a/app/services/issues/close_service.rb +++ b/app/services/issues/close_service.rb @@ -33,6 +33,7 @@ module Issues notification_service.async.close_issue(issue, current_user, closed_via: closed_via) if notifications todo_service.close_issue(issue, current_user) + resolve_alert(issue) execute_hooks(issue, 'close') invalidate_cache_counts(issue, users: issue.assignees) issue.update_project_counter_caches @@ -58,6 +59,22 @@ module Issues SystemNoteService.change_status(issue, issue.project, current_user, issue.state, current_commit) end + def resolve_alert(issue) + return unless alert = issue.alert_management_alert + return if alert.resolved? + + if alert.resolve + SystemNotes::AlertManagementService.new(noteable: alert, project: alert.project, author: current_user).closed_alert_issue(issue) + else + Gitlab::AppLogger.warn( + message: 'Cannot resolve an associated Alert Management alert', + issue_id: issue.id, + alert_id: alert.id, + alert_errors: alert.errors.messages + ) + end + end + def store_first_mentioned_in_commit_at(issue, merge_request) metrics = issue.metrics return if metrics.nil? || metrics.first_mentioned_in_commit_at diff --git a/app/services/issues/reorder_service.rb b/app/services/issues/reorder_service.rb index 02c18d31b5e..c82ad6ea501 100644 --- a/app/services/issues/reorder_service.rb +++ b/app/services/issues/reorder_service.rb @@ -40,7 +40,7 @@ module Issues def move_between_ids ids = [params[:move_after_id], params[:move_before_id]] .map(&:to_i) - .map { |m| m.positive? ? m : nil } + .map { |m| m > 0 ? m : nil } ids.any? ? ids : nil end diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb index 8d22f0edcdd..ac7baba3b7c 100644 --- a/app/services/issues/update_service.rb +++ b/app/services/issues/update_service.rb @@ -22,7 +22,7 @@ module Issues end def after_update(issue) - IssuesChannel.broadcast_to(issue, event: 'updated') if Feature.enabled?(:broadcast_issue_updates, issue.project) + IssuesChannel.broadcast_to(issue, event: 'updated') if Gitlab::ActionCable::Config.in_app? || Feature.enabled?(:broadcast_issue_updates, issue.project) end def handle_changes(issue, options) @@ -43,7 +43,7 @@ module Issues if issue.assignees != old_assignees create_assignee_note(issue, old_assignees) notification_service.async.reassigned_issue(issue, current_user, old_assignees) - todo_service.reassigned_issuable(issue, current_user, old_assignees) + todo_service.reassigned_assignable(issue, current_user, old_assignees) end if issue.previous_changes.include?('confidential') |