Automatic merge of gitlab-org/gitlab-ce master

spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb

@@ -3,18 +3,15 @@
 require 'spec_helper'
 
 # This is a regression test for https://gitlab.com/gitlab-org/gitlab-ce/issues/37569
-# Quarantine: https://gitlab.com/gitlab-org/gitlab-ce/issues/65329
-describe 'Projects > Files > User browses a tree with a folder containing only a folder', :quarantine do
+describe 'Projects > Files > User browses a tree with a folder containing only a folder', :js do
   let(:project) { create(:project, :empty_repo) }
   let(:user) { project.owner }
 
   before do
-    # We need to disable the tree.flat_path provided by Gitaly to reproduce the issue
-    allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(false)
-
     project.repository.create_dir(user, 'foo/bar', branch_name: 'master', message: 'Add the foo/bar folder')
     sign_in(user)
     visit(project_tree_path(project, project.repository.root_ref))
+    wait_for_requests
   end
 
   it 'shows the nested folder on a single row' do