Commit faf6bd5b authored by Peter Leitzen's avatar Peter Leitzen

Merge branch 'tr-incident-sla-feature-flag-removal' into 'master'

[RUN AS-IF-FOSS] Remove `:incident_sla_dev` feature flag

See merge request gitlab-org/gitlab!45085
parents f07bcc8c 6f2a4291
---
name: incident_sla_dev
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43648
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/266931
group: group::health
type: development
default_enabled: false
......@@ -6913,7 +6913,7 @@ type EpicIssue implements CurrentUserTodos & Noteable {
severity: IssuableSeverity
"""
Timestamp of when the issue SLA expires. Returns null if `incident_sla_dev` feature flag is disabled.
Timestamp of when the issue SLA expires.
"""
slaDueAt: Time
......@@ -9112,7 +9112,7 @@ type Issue implements CurrentUserTodos & Noteable {
severity: IssuableSeverity
"""
Timestamp of when the issue SLA expires. Returns null if `incident_sla_dev` feature flag is disabled.
Timestamp of when the issue SLA expires.
"""
slaDueAt: Time
......
......@@ -18980,7 +18980,7 @@
},
{
"name": "slaDueAt",
"description": "Timestamp of when the issue SLA expires. Returns null if `incident_sla_dev` feature flag is disabled.",
"description": "Timestamp of when the issue SLA expires.",
"args": [
],
......@@ -24752,7 +24752,7 @@
},
{
"name": "slaDueAt",
"description": "Timestamp of when the issue SLA expires. Returns null if `incident_sla_dev` feature flag is disabled.",
"description": "Timestamp of when the issue SLA expires.",
"args": [
],
......@@ -1089,7 +1089,7 @@ Relationship between an epic and an issue.
| `relationPath` | String | URI path of the epic-issue relation |
| `relativePosition` | Int | Relative position of the issue (used for positioning in epic tree and issue boards) |
| `severity` | IssuableSeverity | Severity level of the incident |
| `slaDueAt` | Time | Timestamp of when the issue SLA expires. Returns null if `incident_sla_dev` feature flag is disabled. |
| `slaDueAt` | Time | Timestamp of when the issue SLA expires. |
| `state` | IssueState! | State of the issue |
| `statusPagePublishedIncident` | Boolean | Indicates whether an issue is published to the status page |
| `subscribed` | Boolean! | Indicates the currently logged in user is subscribed to the issue |
......@@ -1280,7 +1280,7 @@ Represents a recorded measurement (object count) for the Admins.
| `reference` | String! | Internal reference of the issue. Returned in shortened format by default |
| `relativePosition` | Int | Relative position of the issue (used for positioning in epic tree and issue boards) |
| `severity` | IssuableSeverity | Severity level of the incident |
| `slaDueAt` | Time | Timestamp of when the issue SLA expires. Returns null if `incident_sla_dev` feature flag is disabled. |
| `slaDueAt` | Time | Timestamp of when the issue SLA expires. |
| `state` | IssueState! | State of the issue |
| `statusPagePublishedIncident` | Boolean | Indicates whether an issue is published to the status page |
| `subscribed` | Boolean! | Indicates the currently logged in user is subscribed to the issue |
......
......@@ -31,7 +31,7 @@ module EE
description: 'Indicates whether an issue is published to the status page'
field :sla_due_at, ::Types::TimeType, null: true,
description: 'Timestamp of when the issue SLA expires. Returns null if `incident_sla_dev` feature flag is disabled.'
description: 'Timestamp of when the issue SLA expires.'
end
end
end
......
---
title: Introduce optional Service Level Agreement (SLA) for Incidents
merge_request: 45085
author:
type: added
......@@ -4,7 +4,7 @@ module IncidentManagement
module IncidentSla
class << self
def available_for?(project)
::Feature.enabled?(:incident_sla_dev, project) && project.feature_available?(:incident_sla)
project.feature_available?(:incident_sla)
end
end
end
......
......@@ -817,16 +817,14 @@ RSpec.describe Issue do
subject { issue.sla_available? }
where(:feature_enabled, :incident_type, :license_available, :sla_available) do
false | true | true | false
true | false | true | false
true | true | false | false
true | true | true | true
where(:incident_type, :license_available, :sla_available) do
false | true | false
true | false | false
true | true | true
end
with_them do
before do
stub_feature_flags(incident_sla_dev: feature_enabled)
stub_licensed_features(incident_sla: license_available)
issue_type = incident_type ? 'incident' : 'issue'
issue.update(issue_type: issue_type)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment