From 0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 6 Feb 2020 15:09:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/projects/tree_controller.rb | 2 +- app/controllers/projects_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb index aba28e5c835..b8fe2a47b30 100644 --- a/app/controllers/projects/tree_controller.rb +++ b/app/controllers/projects/tree_controller.rb @@ -32,7 +32,7 @@ class Projects::TreeController < Projects::ApplicationController respond_to do |format| format.html do - lfs_blob_ids if Feature.disabled?(:vue_file_list, @project) + lfs_blob_ids if Feature.disabled?(:vue_file_list, @project, default_enabled: true) @last_commit = @repository.last_commit_for_path(@commit.id, @tree.path) || @commit end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index d39a4c373ff..31b86946ca2 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -296,7 +296,7 @@ class ProjectsController < Projects::ApplicationController private def show_blob_ids? - repo_exists? && project_view_files? && Feature.disabled?(:vue_file_list, @project) + repo_exists? && project_view_files? && Feature.disabled?(:vue_file_list, @project, default_enabled: true) end # Render project landing depending of which features are available -- cgit v1.2.1