diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 15:09:11 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 15:09:11 +0000 |
| commit | 0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 (patch) | |
| tree | fd70d5bc63fe152e0a67aaa5a70e4c9f16dc6ffc /app/controllers | |
| parent | 5564275a0b378298dc6281599cbfe71a937109ff (diff) | |
| download | gitlab-ce-0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/tree_controller.rb | 2 | ||||
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
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 |