diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-11 21:16:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-11 21:16:38 +0300 |
| commit | b330f7f0bfb2035b03e84e5fa751816b6ad9b841 (patch) | |
| tree | 5dd72fddc7545c3fb6c5bff6b662bea3dea54d79 /app/controllers/projects | |
| parent | a8281ac43424e4b820286823bdb48f068b21d7d3 (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 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 0b1516f6f45..fb9d1a85656 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -49,10 +49,6 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo push_frontend_feature_flag(:diff_searching_usage_data, @project, default_enabled: :yaml) end - before_action do - push_frontend_feature_flag(:show_relevant_approval_rule_approvers, @project, default_enabled: :yaml) - end - around_action :allow_gitaly_ref_name_caching, only: [:index, :show, :discussions] after_action :log_merge_request_show, only: [:show] |