diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-13 21:11:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-13 21:11:49 +0300 |
| commit | 718637f88ce9933f581c58e27dfffc389cbb6111 (patch) | |
| tree | ab46e3b90bff9842387639ff849bfeee9c5e63a3 /app/controllers | |
| parent | b0b94ea6e54f824d02840912f7086e9f47350571 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/incidents_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/issues_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/search_controller.rb | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/projects/incidents_controller.rb b/app/controllers/projects/incidents_controller.rb index e78c9171a53..bacf3192ee6 100644 --- a/app/controllers/projects/incidents_controller.rb +++ b/app/controllers/projects/incidents_controller.rb @@ -12,6 +12,7 @@ class Projects::IncidentsController < Projects::ApplicationController 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) push_force_frontend_feature_flag(:linked_work_items, @project&.linked_work_items_feature_flag_enabled?) + push_frontend_feature_flag(:notifications_todos_buttons, project) end feature_category :incident_management diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 80783534ca3..4849cccac52 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -70,6 +70,7 @@ class Projects::IssuesController < Projects::ApplicationController push_frontend_feature_flag(:epic_widget_edit_confirmation, project) push_frontend_feature_flag(:moved_mr_sidebar, project) push_force_frontend_feature_flag(:linked_work_items, project.linked_work_items_feature_flag_enabled?) + push_frontend_feature_flag(:notifications_todos_buttons, project) end around_action :allow_gitaly_ref_name_caching, only: [:discussions] diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 3685352b17d..7fff31c767f 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -47,10 +47,6 @@ class SearchController < ApplicationController push_frontend_feature_flag(:search_merge_requests_hide_archived_projects, current_user) end - before_action only: :show do - push_frontend_feature_flag(:search_commits_hide_archived_projects, current_user) - end - rescue_from ActiveRecord::QueryCanceled, with: :render_timeout layout 'search' |