From 8c189e1d5deaaf3f356684319e1ee101c60bc5cc Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 7 Aug 2021 12:09:49 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/projects/blob_controller.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/controllers/projects/blob_controller.rb') diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 08066acb45c..acf6b6116b8 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -44,6 +44,7 @@ class Projects::BlobController < Projects::ApplicationController before_action do push_frontend_feature_flag(:refactor_blob_viewer, @project, default_enabled: :yaml) push_frontend_feature_flag(:consolidated_edit_button, @project, default_enabled: :yaml) + push_licensed_feature(:file_locks) if @project.licensed_feature_available?(:file_locks) end def new -- cgit v1.2.1