diff options
Diffstat (limited to 'app/services/issues/base_service.rb')
-rw-r--r-- | app/services/issues/base_service.rb | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb index 577f7dd1e3a..37d667d4be8 100644 --- a/app/services/issues/base_service.rb +++ b/app/services/issues/base_service.rb @@ -36,8 +36,8 @@ module Issues private def find_work_item_type_id(issue_type) - work_item_type = WorkItem::Type.default_by_type(issue_type) - work_item_type ||= WorkItem::Type.default_issue_type + work_item_type = WorkItems::Type.default_by_type(issue_type) + work_item_type ||= WorkItems::Type.default_issue_type work_item_type.id end @@ -46,7 +46,6 @@ module Issues super params.delete(:issue_type) unless create_issue_type_allowed?(issue, params[:issue_type]) - filter_incident_label(issue) if params[:issue_type] moved_issue = params.delete(:moved_issue) @@ -89,37 +88,6 @@ module Issues Milestones::IssuesCountService.new(milestone).delete_cache end - - # @param issue [Issue] - def filter_incident_label(issue) - return unless add_incident_label?(issue) || remove_incident_label?(issue) - - label = ::IncidentManagement::CreateIncidentLabelService - .new(project, current_user) - .execute - .payload[:label] - - # These(add_label_ids, remove_label_ids) are being added ahead of time - # to be consumed by #process_label_ids, this allows system notes - # to be applied correctly alongside the label updates. - if add_incident_label?(issue) - params[:add_label_ids] ||= [] - params[:add_label_ids] << label.id - else - params[:remove_label_ids] ||= [] - params[:remove_label_ids] << label.id - end - end - - # @param issue [Issue] - def add_incident_label?(issue) - issue.incident? - end - - # @param _issue [Issue, nil] - def remove_incident_label?(_issue) - false - end end end |