Merge branch 'sy-default-enable-incident-escalations' into 'master'

Enable incident escalations feature flag by default

See merge request gitlab-org/gitlab!85270

app/controllers/projects/incidents_controller.rb

@@ -7,7 +7,7 @@ class Projects::IncidentsController < Projects::ApplicationController
   before_action :authorize_read_issue!
   before_action :load_incident, only: [:show]
   before_action do
-    push_frontend_feature_flag(:incident_escalations, @project)
+    push_frontend_feature_flag(:incident_escalations, @project, default_enabled: :yaml)
     push_frontend_feature_flag(:incident_timeline, @project, default_enabled: :yaml)
   end
 

app/graphql/mutations/user_preferences/update.rb

@@ -38,7 +38,7 @@ module Mutations
       def disabled_sort_value?(args)
         return false unless [:escalation_status_asc, :escalation_status_desc].include?(args[:issues_sort])
 
-        Feature.disabled?(:incident_escalations)
+        Feature.disabled?(:incident_escalations, default_enabled: :yaml)
       end
     end
   end

app/graphql/resolvers/base_issues_resolver.rb

@@ -35,7 +35,7 @@ module Resolvers
 
     def prepare_params(args, parent)
       return unless [:escalation_status_asc, :escalation_status_desc].include?(args[:sort])
-      return if Feature.enabled?(:incident_escalations, parent)
+      return if Feature.enabled?(:incident_escalations, parent, default_enabled: :yaml)
 
       args[:sort] = :created_desc # default for sort argument
     end

app/models/concerns/issuable.rb

@@ -195,7 +195,7 @@ module Issuable
     end
 
     def supports_escalation?
-      return false unless ::Feature.enabled?(:incident_escalations, project)
+      return false unless ::Feature.enabled?(:incident_escalations, project, default_enabled: :yaml)
 
       incident?
     end

config/feature_flags/development/incident_escalations.yml

@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/345769
 milestone: '14.6'
 type: development
 group: group::respond
-default_enabled: false
+default_enabled: true

doc/operations/incident_management/incidents.md

@@ -255,11 +255,12 @@ Add a to-do for incidents that you want to track in your to-do list. Click the
 
 ### Change incident status
 
-> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/5716) in GitLab 14.9 [with a flag](../../administration/feature_flags.md) named `incident_escalations`. Disabled by default.
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/5716) in GitLab 14.9 [with a flag](../../administration/feature_flags.md) named `incident_escalations`. Disabled by default.
+> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/345769) in GitLab 14.10.
 
 FLAG:
-By default this feature is not available. To make it available per project or for your entire
-instance, ask an administrator to [enable the feature flag](../../administration/feature_flags.md)
+This feature is available by default. To disable it per project or for your entire
+instance, ask an administrator to [disable the feature flag](../../administration/feature_flags.md)
 named `incident_escalations`.
 
 For users with the Developer role or higher, select **Edit** in the **Status** section of the
@@ -278,11 +279,12 @@ updating the incident status also updates the alert status.
 
 ### Change escalation policy **(PREMIUM)**
 
-> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/5716) in GitLab 14.9 [with a flag](../../administration/feature_flags.md) named `incident_escalations`. Disabled by default.
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/5716) in GitLab 14.9 [with a flag](../../administration/feature_flags.md) named `incident_escalations`. Disabled by default.
+> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/345769) in GitLab 14.10.
 
 FLAG:
-By default this feature is not available. To make it available per project or for your entire
-instance, ask an administrator to [enable the feature flag](../../administration/feature_flags.md)
+This feature is available by default. To disable it per project or for your entire
+instance, ask an administrator to [disable the feature flag](../../administration/feature_flags.md)
 named `incident_escalations`.
 
 For users with the Developer role or higher, select **Edit** in the **Escalation policy** section of

doc/operations/incident_management/paging.md

@@ -50,11 +50,12 @@ or stop alert escalations by [updating the alert's status](alerts.md#update-an-a
 
 ### Escalating an incident
 
-> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/5716) in GitLab 14.9 [with a flag](../../administration/feature_flags.md) named `incident_escalations`. Disabled by default.
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/5716) in GitLab 14.9 [with a flag](../../administration/feature_flags.md) named `incident_escalations`. Disabled by default.
+> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/345769) in GitLab 14.10.
 
 FLAG:
-By default this feature is not available. To make it available per project or for your entire
-instance, ask an administrator to [enable the feature flag](../../administration/feature_flags.md)
+This feature is available by default. To disable it per project or for your entire
+instance, ask an administrator to [disable the feature flag](../../administration/feature_flags.md)
 named `incident_escalations`.
 
 For incidents, paging on-call responders is optional for each individual incident.