diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-22 03:10:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-11-22 03:10:40 +0300 |
| commit | e3736bd03e55076fb8d9f5b4cc4602b32d13b2ec (patch) | |
| tree | dd15325d34dd9bdb5fe37570f1ae691e6e329b7c /app/controllers/projects | |
| parent | a3e6d34643e760d1a8b8bd1e7e32d8d74c1ea678 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects')
| -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 6368ae914dc..5a079b465b7 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -46,6 +46,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo push_frontend_feature_flag(:mr_pipelines_graphql, project) push_frontend_feature_flag(:notifications_todos_buttons, current_user) push_frontend_feature_flag(:mr_request_changes, current_user) + push_frontend_feature_flag(:merge_blocked_component, current_user) end before_action only: [:edit] do |