diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-19 15:19:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-19 15:19:34 +0000 |
| commit | b6d63c915a91aeb7a4437349c53e68be8c50cf4e (patch) | |
| tree | 8617959c1d6b9137e4cefad06aedbf574295cd6c /app/controllers/projects | |
| parent | 2017bc90a671eac669f0114b6ef508e151409c4f (diff) | |
| download | gitlab-ce-b6d63c915a91aeb7a4437349c53e68be8c50cf4e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/incidents_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/projects/incidents_controller.rb b/app/controllers/projects/incidents_controller.rb index 3842a88d15b..7121096bd77 100644 --- a/app/controllers/projects/incidents_controller.rb +++ b/app/controllers/projects/incidents_controller.rb @@ -10,6 +10,7 @@ class Projects::IncidentsController < Projects::ApplicationController push_force_frontend_feature_flag(:work_items, @project&.work_items_feature_flag_enabled?) push_force_frontend_feature_flag(:work_items_mvc, @project&.work_items_mvc_feature_flag_enabled?) push_force_frontend_feature_flag(:work_items_mvc_2, @project&.work_items_mvc_2_feature_flag_enabled?) + push_frontend_feature_flag(:moved_mr_sidebar, project) end feature_category :incident_management diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index efe88d17cab..d50f681beec 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -67,6 +67,7 @@ class Projects::IssuesController < Projects::ApplicationController push_force_frontend_feature_flag(:work_items_mvc, project&.work_items_mvc_feature_flag_enabled?) push_force_frontend_feature_flag(:work_items_mvc_2, project&.work_items_mvc_2_feature_flag_enabled?) push_frontend_feature_flag(:epic_widget_edit_confirmation, project) + push_frontend_feature_flag(:moved_mr_sidebar, project) end around_action :allow_gitaly_ref_name_caching, only: [:discussions] |