summaryrefslogtreecommitdiff
path: root/app/controllers/projects/incidents_controller.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-05-06 15:09:03 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-05-06 15:09:03 +0000
commit67fa8362ae35ab6134454aa74ad536eb405dff29 (patch)
tree8adb151eabf5467dd3c3ee7dfbd0a7df70c5fd51 /app/controllers/projects/incidents_controller.rb
parent669ad9e431c7647f01bda681aab2c0ad2cb58826 (diff)
downloadgitlab-ce-67fa8362ae35ab6134454aa74ad536eb405dff29.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/incidents_controller.rb')
-rw-r--r--app/controllers/projects/incidents_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/incidents_controller.rb b/app/controllers/projects/incidents_controller.rb
index cce1317d220..fd7ba7b5460 100644
--- a/app/controllers/projects/incidents_controller.rb
+++ b/app/controllers/projects/incidents_controller.rb
@@ -7,8 +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, default_enabled: :yaml)
- push_frontend_feature_flag(:incident_timeline, @project, default_enabled: :yaml)
+ push_frontend_feature_flag(:incident_escalations, @project)
+ push_frontend_feature_flag(:incident_timeline, @project)
end
feature_category :incident_management