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

2 files changed, 22 insertions, 1 deletions

diff --git a/spec/features/projects/show/user_sees_readme_spec.rb b/spec/features/projects/show/user_sees_readme_spec.rb
index 250f707948e..6a5b9472be8 100644
--- a/spec/features/projects/show/user_sees_readme_spec.rb
+++ b/spec/features/projects/show/user_sees_readme_spec.rb
@@ -14,4 +14,25 @@ RSpec.describe 'Projects > Show > User sees README' do
       expect(page).to have_content 'testme'
     end
   end
+
+  context 'obeying robots.txt' do
+    before do
+      Gitlab::Testing::RobotsBlockerMiddleware.block_requests!
+    end
+
+    after do
+      Gitlab::Testing::RobotsBlockerMiddleware.allow_requests!
+    end
+
+    # For example, see this regression we had in
+    # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39520
+    it 'does not block the requests necessary to load the project README', :js do
+      visit project_path(project)
+      wait_for_requests
+
+      page.within('.readme-holder') do
+        expect(page).to have_content 'testme'
+      end
+    end
+  end
 end
diff --git a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
index afa9de5ce86..81736fefae9 100644
--- a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
+++ b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
@@ -226,7 +226,7 @@ RSpec.describe 'Projects > Show > User sees setup shortcut buttons' do
             expect(project.repository.gitlab_ci_yml).to be_nil
 
             page.within('.project-buttons') do
-              expect(page).to have_link('Set up CI/CD', href: presenter.add_ci_yml_path)
+              expect(page).to have_link('Set up CI/CD', href: presenter.add_ci_yml_ide_path)
             end
           end