diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-07 12:09:49 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-07 12:09:49 +0000 |
commit | 8c189e1d5deaaf3f356684319e1ee101c60bc5cc (patch) | |
tree | 85e626141059c57f08f5dffec18ea864ce37c708 /app/controllers/projects/blob_controller.rb | |
parent | 84ac2a3fcdaa8df2c35c54b1738d8e943263d4bb (diff) | |
download | gitlab-ce-8c189e1d5deaaf3f356684319e1ee101c60bc5cc.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/blob_controller.rb')
-rw-r--r-- | app/controllers/projects/blob_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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 |