diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-07 15:07:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-07 15:07:34 +0000 |
| commit | b4028d450087e97f26d4baa23e08396bcbabe3e0 (patch) | |
| tree | f84a5cbb29e43bab0ba58db1bc5619112c8c482e /app/controllers/projects_controller.rb | |
| parent | 05f1d5d9813332bdd456cb358517e56168a24224 (diff) | |
| download | gitlab-ce-b4028d450087e97f26d4baa23e08396bcbabe3e0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 47d6fb67108..5a65b0eb36b 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -21,8 +21,7 @@ class ProjectsController < Projects::ApplicationController before_action :assign_ref_vars, if: -> { action_name == 'show' && repo_exists? } before_action :tree, if: -> { action_name == 'show' && repo_exists? && project_view_files? } - before_action :lfs_blob_ids, - if: -> { action_name == 'show' && repo_exists? && project_view_files? } + before_action :lfs_blob_ids, if: :show_blob_ids?, only: :show before_action :project_export_enabled, only: [:export, :download_export, :remove_export, :generate_new_export] before_action :present_project, only: [:edit] before_action :authorize_download_code!, only: [:refs] @@ -296,6 +295,10 @@ class ProjectsController < Projects::ApplicationController private + def show_blob_ids? + repo_exists? && project_view_files? && Feature.disabled?(:vue_file_list, @project) + end + # Render project landing depending of which features are available # So if page is not available in the list it renders the next page # |