From b330f7f0bfb2035b03e84e5fa751816b6ad9b841 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 11 Jan 2022 18:16:38 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/projects/merge_requests_controller.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'app/controllers/projects') 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] -- cgit v1.2.3