summaryrefslogtreecommitdiff
path: root/app/controllers/projects
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-03 15:12:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-03 15:12:58 +0000
commit27a5080c34c64a84219d855d652b994c5e344a0a (patch)
tree1f6bcb68378e4965b4e93a846d8a939af18aeec6 /app/controllers/projects
parent2c01907a1ab4b328e2f20ddf9e10dfe6dc17105a (diff)
downloadgitlab-ce-27a5080c34c64a84219d855d652b994c5e344a0a.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects')
-rw-r--r--app/controllers/projects/merge_requests_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb
index 89b7767aa40..d967aa89eb7 100644
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@@ -52,6 +52,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo
push_frontend_feature_flag(:hide_create_issue_resolve_all, project)
push_frontend_feature_flag(:auto_merge_labels_mr_widget, project)
push_frontend_feature_flag(:summarize_my_code_review, current_user)
+ push_frontend_feature_flag(:mr_activity_filters, current_user)
end
around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :diffs, :discussions]