From 454973238cb3eed58f7d901b87ceb29acf6febbd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 6 May 2021 21:10:07 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/projects/blob_controller.rb | 4 ++++ app/controllers/projects/merge_requests_controller.rb | 1 + 2 files changed, 5 insertions(+) (limited to 'app/controllers/projects') diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 65b7a78cb58..cbee33853bb 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -36,6 +36,10 @@ class Projects::BlobController < Projects::ApplicationController feature_category :source_code_management + before_action do + push_frontend_feature_flag(:refactor_blob_viewer, @project, default_enabled: :yaml) + end + def new commit unless @repository.empty? end diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 94fd6d86abc..58a05d498c7 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -59,6 +59,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo before_action do push_frontend_feature_flag(:mr_collapsed_approval_rules, @project) + 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] -- cgit v1.2.1