summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-12-15 09:02:24 +0000
committerDouwe Maan <douwe@gitlab.com>2017-12-15 09:02:24 +0000
commit1baea77438779e74657b49ca26810d6c8f041b41 (patch)
tree480634259d9a6d88351a842a4a49561001ec111c /app/controllers/projects_controller.rb
parentc96e2edc105a46c93bcbf6841c8ec52270d6a601 (diff)
parentcbd3ce8f41fc5691a1d23aca0ffe3221ab5d26af (diff)
downloadgitlab-ce-1baea77438779e74657b49ca26810d6c8f041b41.tar.gz
Merge branch 'lfs-badge' into 'master'
Added LFS badge to indicate LFS tracked files Closes #15567 See merge request gitlab-org/gitlab-ce!15845
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 8e9d6766d80..6f609348402 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -9,6 +9,7 @@ class ProjectsController < Projects::ApplicationController
before_action :repository, except: [:index, :new, :create]
before_action :assign_ref_vars, only: [:show], if: :repo_exists?
before_action :tree, only: [:show], if: [:repo_exists?, :project_view_files?]
+ before_action :lfs_blob_ids, only: [:show], if: [:repo_exists?, :project_view_files?]
before_action :project_export_enabled, only: [:export, :download_export, :remove_export, :generate_new_export]
# Authorize