Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6f2a4291
Commit
6f2a4291
authored
Oct 15, 2020
by
Tristan Read
Committed by
Peter Leitzen
Oct 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[RUN AS-IF-FOSS] Remove `:incident_sla_dev` feature flag
parent
61759175
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
17 additions
and
21 deletions
+17
-21
config/feature_flags/development/incident_sla_dev.yml
config/feature_flags/development/incident_sla_dev.yml
+0
-7
doc/api/graphql/reference/gitlab_schema.graphql
doc/api/graphql/reference/gitlab_schema.graphql
+2
-2
doc/api/graphql/reference/gitlab_schema.json
doc/api/graphql/reference/gitlab_schema.json
+2
-2
doc/api/graphql/reference/index.md
doc/api/graphql/reference/index.md
+2
-2
ee/app/graphql/ee/types/issue_type.rb
ee/app/graphql/ee/types/issue_type.rb
+1
-1
ee/changelogs/unreleased/tr-incident-sla-feature-flag-removal.yml
...elogs/unreleased/tr-incident-sla-feature-flag-removal.yml
+5
-0
ee/lib/incident_management/incident_sla.rb
ee/lib/incident_management/incident_sla.rb
+1
-1
ee/spec/models/issue_spec.rb
ee/spec/models/issue_spec.rb
+4
-6
No files found.
config/feature_flags/development/incident_sla_dev.yml
deleted
100644 → 0
View file @
61759175
---
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
doc/api/graphql/reference/gitlab_schema.graphql
View file @
6f2a4291
...
@@ -6913,7 +6913,7 @@ type EpicIssue implements CurrentUserTodos & Noteable {
...
@@ -6913,7 +6913,7 @@ type EpicIssue implements CurrentUserTodos & Noteable {
severity
:
IssuableSeverity
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
slaDueAt
:
Time
...
@@ -9112,7 +9112,7 @@ type Issue implements CurrentUserTodos & Noteable {
...
@@ -9112,7 +9112,7 @@ type Issue implements CurrentUserTodos & Noteable {
severity
:
IssuableSeverity
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
slaDueAt
:
Time
...
...
doc/api/graphql/reference/gitlab_schema.json
View file @
6f2a4291
...
@@ -18980,7 +18980,7 @@
...
@@ -18980,7 +18980,7 @@
},
},
{
{
"name": "slaDueAt",
"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": [
"args": [
],
],
...
@@ -24752,7 +24752,7 @@
...
@@ -24752,7 +24752,7 @@
},
},
{
{
"name": "slaDueAt",
"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": [
"args": [
],
],
doc/api/graphql/reference/index.md
View file @
6f2a4291
...
@@ -1089,7 +1089,7 @@ Relationship between an epic and an issue.
...
@@ -1089,7 +1089,7 @@ Relationship between an epic and an issue.
|
`relationPath`
| String | URI path of the epic-issue relation |
|
`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) |
|
`relativePosition`
| Int | Relative position of the issue (used for positioning in epic tree and issue boards) |
|
`severity`
| IssuableSeverity | Severity level of the incident |
|
`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 |
|
`state`
| IssueState! | State of the issue |
|
`statusPagePublishedIncident`
| Boolean | Indicates whether an issue is published to the status page |
|
`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 |
|
`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.
...
@@ -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 |
|
`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) |
|
`relativePosition`
| Int | Relative position of the issue (used for positioning in epic tree and issue boards) |
|
`severity`
| IssuableSeverity | Severity level of the incident |
|
`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 |
|
`state`
| IssueState! | State of the issue |
|
`statusPagePublishedIncident`
| Boolean | Indicates whether an issue is published to the status page |
|
`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 |
|
`subscribed`
| Boolean! | Indicates the currently logged in user is subscribed to the issue |
...
...
ee/app/graphql/ee/types/issue_type.rb
View file @
6f2a4291
...
@@ -31,7 +31,7 @@ module EE
...
@@ -31,7 +31,7 @@ module EE
description:
'Indicates whether an issue is published to the status page'
description:
'Indicates whether an issue is published to the status page'
field
:sla_due_at
,
::
Types
::
TimeType
,
null:
true
,
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
end
end
end
...
...
ee/changelogs/unreleased/tr-incident-sla-feature-flag-removal.yml
0 → 100644
View file @
6f2a4291
---
title
:
Introduce optional Service Level Agreement (SLA) for Incidents
merge_request
:
45085
author
:
type
:
added
ee/lib/incident_management/incident_sla.rb
View file @
6f2a4291
...
@@ -4,7 +4,7 @@ module IncidentManagement
...
@@ -4,7 +4,7 @@ module IncidentManagement
module
IncidentSla
module
IncidentSla
class
<<
self
class
<<
self
def
available_for?
(
project
)
def
available_for?
(
project
)
::
Feature
.
enabled?
(
:incident_sla_dev
,
project
)
&&
project
.
feature_available?
(
:incident_sla
)
project
.
feature_available?
(
:incident_sla
)
end
end
end
end
end
end
...
...
ee/spec/models/issue_spec.rb
View file @
6f2a4291
...
@@ -817,16 +817,14 @@ RSpec.describe Issue do
...
@@ -817,16 +817,14 @@ RSpec.describe Issue do
subject
{
issue
.
sla_available?
}
subject
{
issue
.
sla_available?
}
where
(
:feature_enabled
,
:incident_type
,
:license_available
,
:sla_available
)
do
where
(
:incident_type
,
:license_available
,
:sla_available
)
do
false
|
true
|
true
|
false
false
|
true
|
false
true
|
false
|
true
|
false
true
|
false
|
false
true
|
true
|
false
|
false
true
|
true
|
true
true
|
true
|
true
|
true
end
end
with_them
do
with_them
do
before
do
before
do
stub_feature_flags
(
incident_sla_dev:
feature_enabled
)
stub_licensed_features
(
incident_sla:
license_available
)
stub_licensed_features
(
incident_sla:
license_available
)
issue_type
=
incident_type
?
'incident'
:
'issue'
issue_type
=
incident_type
?
'incident'
:
'issue'
issue
.
update
(
issue_type:
issue_type
)
issue
.
update
(
issue_type:
issue_type
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment