diff options
author | Phil Hughes <me@iamphill.com> | 2017-12-14 14:59:01 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-12-14 14:59:01 +0300 |
commit | cbd3ce8f41fc5691a1d23aca0ffe3221ab5d26af (patch) | |
tree | ed843b1c13b5e231abc56a6fc304fea9868d8c73 | |
parent | 9c132216b74258d900d7bbfb88f158d53ede90b7 (diff) |
moved lfs_blob_ids method into ExtractsPath module
-rw-r--r-- | app/controllers/projects/tree_controller.rb | 4 | ||||
-rw-r--r-- | app/controllers/projects_controller.rb | 5 | ||||
-rw-r--r-- | lib/extracts_path.rb | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb index 2998ec21dca..f752a46f828 100644 --- a/app/controllers/projects/tree_controller.rb +++ b/app/controllers/projects/tree_controller.rb @@ -26,10 +26,8 @@ class Projects::TreeController < Projects::ApplicationController respond_to do |format| format.html do - blob_ids = tree.blobs.map(&:id) - + lfs_blob_ids @last_commit = @repository.last_commit_for_path(@commit.id, @tree.path) || @commit - @lfs_blob_ids = Gitlab::Git::Blob.batch_lfs_pointers(@repo, blob_ids).map(&:id) end format.js do diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index bce3a8d42e4..b06981b4b1d 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -404,9 +404,4 @@ class ProjectsController < Projects::ApplicationController # redirect_to request.original_url.sub(/\.git\/?\Z/, '') if params[:format] == 'git' end - - def lfs_blob_ids - blob_ids = tree.blobs.map(&:id) - @lfs_blob_ids = Gitlab::Git::Blob.batch_lfs_pointers(@repo, blob_ids).map(&:id) - end end diff --git a/lib/extracts_path.rb b/lib/extracts_path.rb index f576ef74603..27c712a84d4 100644 --- a/lib/extracts_path.rb +++ b/lib/extracts_path.rb @@ -135,6 +135,11 @@ module ExtractsPath @tree ||= @repo.tree(@commit.id, @path) end + def lfs_blob_ids + blob_ids = tree.blobs.map(&:id) + @lfs_blob_ids = Gitlab::Git::Blob.batch_lfs_pointers(@project.repository, blob_ids).map(&:id) + end + private # overriden in subclasses, do not remove |