Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 4 deletions

diff --git a/spec/frontend_integration/ide/ide_integration_spec.js b/spec/frontend_integration/ide/ide_integration_spec.js
index da48c600764..a6108fd71e1 100644
--- a/spec/frontend_integration/ide/ide_integration_spec.js
+++ b/spec/frontend_integration/ide/ide_integration_spec.js
@@ -1,6 +1,5 @@
 import { nextTick } from 'vue';
 import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
-import { setTestTimeout } from 'helpers/timeout';
 import waitForPromises from 'helpers/wait_for_promises';
 import { waitForText } from 'helpers/wait_for_text';
 import { useOverclockTimers } from 'test_helpers/utils/overclock_timers';
@@ -17,9 +16,6 @@ describe('WebIDE', () => {
 
   beforeEach(() => {
     stubPerformanceWebAPI();
-    // For some reason these tests were timing out in CI.
-    // We will investigate in https://gitlab.com/gitlab-org/gitlab/-/issues/298714
-    setTestTimeout(20000);
     setHTMLFixture('<div class="webide-container"></div>');
     container = document.querySelector('.webide-container');
   });