Add latest changes from gitlab-org/gitlab@13-2-stable-ee

1 files changed, 3 insertions, 15 deletions

diff --git a/app/controllers/projects/tree_controller.rb b/app/controllers/projects/tree_controller.rb
index 9cb345724cc..638e1a05c18 100644
--- a/app/controllers/projects/tree_controller.rb
+++ b/app/controllers/projects/tree_controller.rb
@@ -15,26 +15,14 @@ class Projects::TreeController < Projects::ApplicationController
   before_action :authorize_download_code!
   before_action :authorize_edit_tree!, only: [:create_dir]
 
-  before_action only: [:show] do
-    push_frontend_feature_flag(:vue_file_list_lfs_badge, default_enabled: true)
-  end
-
   def show
-    return render_404 unless @repository.commit(@ref)
+    return render_404 unless @commit
 
     if tree.entries.empty?
       if @repository.blob_at(@commit.id, @path)
-        return redirect_to project_blob_path(@project, File.join(@ref, @path))
+        redirect_to project_blob_path(@project, File.join(@ref, @path))
       elsif @path.present?
-        return redirect_to_tree_root_for_missing_path(@project, @ref, @path)
-      end
-    end
-
-    respond_to do |format|
-      format.html do
-        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
+        redirect_to_tree_root_for_missing_path(@project, @ref, @path)
       end
     end
   end