diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-26 12:14:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-26 12:14:20 +0300 |
| commit | 30b1000678f33e5b8ae5b4dcbeb2ae5162a2cc5d (patch) | |
| tree | 2929d8692104f816194e7462e21bcda2c91ed10e /app/services/incident_management | |
| parent | 4b198b6289b1643b6e2571c03a377fe08e6ab504 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/incident_management')
| -rw-r--r-- | app/services/incident_management/issuable_escalation_statuses/prepare_update_service.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/services/incident_management/issuable_escalation_statuses/prepare_update_service.rb b/app/services/incident_management/issuable_escalation_statuses/prepare_update_service.rb index 319d1e8f899..6ccf37e63d6 100644 --- a/app/services/incident_management/issuable_escalation_statuses/prepare_update_service.rb +++ b/app/services/incident_management/issuable_escalation_statuses/prepare_update_service.rb @@ -33,9 +33,8 @@ module IncidentManagement attr_reader :issuable, :current_user, :params, :project def available? - Feature.enabled?(:incident_escalations, project) && + issuable.supports_escalation? && user_has_permissions? && - issuable.supports_escalation? && escalation_status.present? end |