diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-07 18:07:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-07 18:07:34 +0300 |
| commit | b4028d450087e97f26d4baa23e08396bcbabe3e0 (patch) | |
| tree | f84a5cbb29e43bab0ba58db1bc5619112c8c482e /app/controllers/projects/tree_controller.rb | |
| parent | 05f1d5d9813332bdd456cb358517e56168a24224 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/tree_controller.rb')
| -rw-r--r-- | app/controllers/projects/tree_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb index eec89afe354..c2f6fbdc265 100644 --- a/app/controllers/projects/tree_controller.rb +++ b/app/controllers/projects/tree_controller.rb @@ -28,7 +28,8 @@ class Projects::TreeController < Projects::ApplicationController respond_to do |format| format.html do - lfs_blob_ids + lfs_blob_ids if Feature.disabled?(:vue_file_list, @project) + @last_commit = @repository.last_commit_for_path(@commit.id, @tree.path) || @commit end end |