diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-18 15:08:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2024-01-18 15:08:09 +0300 |
commit | 823d2f9a2c8796e5061c59595f96a1132641b26a (patch) | |
tree | 219b13820bd398acc48f3cc719c7a7bfdf77aa26 /app/controllers/projects/merge_requests_controller.rb | |
parent | 627bd5db4e091d0be312c880cbb9139b7c86818b (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
-rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 1 |
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 7aec5345c69..c3faec4c8ec 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -34,6 +34,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo before_action only: :index do push_frontend_feature_flag(:mr_approved_filter, type: :ops) + push_frontend_feature_flag(:mr_merge_user_filter, type: :development) end before_action only: [:show, :diffs] do |