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
d84d237b
Commit
d84d237b
authored
Mar 17, 2022
by
Vitali Tatarintev
Committed by
Sean McGivern
Mar 18, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename incident_timeline_event_tab FF to incident_timeline
Rename the feature flag to cover whole feature
parent
e30cd780
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue
...cripts/issues/show/components/incidents/incident_tabs.vue
+1
-1
app/controllers/projects/incidents_controller.rb
app/controllers/projects/incidents_controller.rb
+1
-1
config/feature_flags/development/incident_timeline.yml
config/feature_flags/development/incident_timeline.yml
+1
-1
ee/spec/frontend/issues/show/components/incidents/incident_tabs_spec.js
...nd/issues/show/components/incidents/incident_tabs_spec.js
+2
-2
spec/frontend/issues/show/components/incidents/incident_tabs_spec.js
...nd/issues/show/components/incidents/incident_tabs_spec.js
+1
-1
No files found.
app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue
View file @
d84d237b
...
...
@@ -52,7 +52,7 @@ export default {
return
this
.
$apollo
.
queries
.
alert
.
loading
;
},
incidentTabEnabled
()
{
return
this
.
glFeatures
.
incidentTimelineEvents
&&
this
.
glFeatures
.
incidentTimeline
EventTab
;
return
this
.
glFeatures
.
incidentTimelineEvents
&&
this
.
glFeatures
.
incidentTimeline
;
},
},
mounted
()
{
...
...
app/controllers/projects/incidents_controller.rb
View file @
d84d237b
...
...
@@ -8,7 +8,7 @@ class Projects::IncidentsController < Projects::ApplicationController
before_action
:load_incident
,
only:
[
:show
]
before_action
do
push_frontend_feature_flag
(
:incident_escalations
,
@project
)
push_frontend_feature_flag
(
:incident_timeline
_event_tab
,
@project
,
default_enabled: :yaml
)
push_frontend_feature_flag
(
:incident_timeline
,
@project
,
default_enabled: :yaml
)
push_licensed_feature
(
:incident_timeline_events
)
if
@project
.
licensed_feature_available?
(
:incident_timeline_events
)
end
...
...
config/feature_flags/development/incident_timeline
_event_tab
.yml
→
config/feature_flags/development/incident_timeline.yml
View file @
d84d237b
---
name
:
incident_timeline
_event_tab
name
:
incident_timeline
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80802
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/353426
milestone
:
'
14.9'
...
...
ee/spec/frontend/issues/show/components/incidents/incident_tabs_spec.js
View file @
d84d237b
...
...
@@ -29,7 +29,7 @@ describe('Incident Tabs component', () => {
fullPath
:
''
,
iid
:
''
,
uploadMetricsFeatureAvailable
:
true
,
glFeatures
:
{
incidentTimeline
EventTab
:
true
,
incidentTimelineEvents
:
true
},
glFeatures
:
{
incidentTimeline
:
true
,
incidentTimelineEvents
:
true
},
},
data
()
{
return
{
alert
:
mockAlert
,
...
data
};
...
...
@@ -62,7 +62,7 @@ describe('Incident Tabs component', () => {
});
it
(
'
does not render timeline tab when feature flag is disabled
'
,
()
=>
{
mountComponent
({},
{
provide
:
{
glFeatures
:
{
incidentTimeline
EventTab
:
false
}
}
});
mountComponent
({},
{
provide
:
{
glFeatures
:
{
incidentTimeline
:
false
}
}
});
expect
(
findTimelineTab
().
exists
()).
toBe
(
false
);
});
...
...
spec/frontend/issues/show/components/incidents/incident_tabs_spec.js
View file @
d84d237b
...
...
@@ -35,7 +35,7 @@ describe('Incident Tabs component', () => {
fullPath
:
''
,
iid
:
''
,
uploadMetricsFeatureAvailable
:
true
,
glFeatures
:
{
incidentTimeline
EventTab
:
true
,
incidentTimelineEvents
:
true
},
glFeatures
:
{
incidentTimeline
:
true
,
incidentTimelineEvents
:
true
},
},
data
()
{
return
{
alert
:
mockAlert
,
...
data
};
...
...
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