diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 10:00:54 +0000 |
| commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
| tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/controllers/projects/incidents_controller.rb | |
| parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) | |
| download | gitlab-ce-3cccd102ba543e02725d247893729e5c73b38295.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/controllers/projects/incidents_controller.rb')
| -rw-r--r-- | app/controllers/projects/incidents_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/projects/incidents_controller.rb b/app/controllers/projects/incidents_controller.rb index 293581a6744..dd1e51bb9bd 100644 --- a/app/controllers/projects/incidents_controller.rb +++ b/app/controllers/projects/incidents_controller.rb @@ -7,9 +7,8 @@ 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_timeline_event_tab, @project, default_enabled: :yaml) - push_licensed_feature(:incident_timeline_events) if @project.licensed_feature_available?(:incident_timeline_events) + push_frontend_feature_flag(:incident_escalations, @project, default_enabled: :yaml) + push_frontend_feature_flag(:incident_timeline, @project, default_enabled: :yaml) end feature_category :incident_management |