From 8c4198cbe631278e87fee04157d23494fbb80cdb Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 20 Feb 2020 12:08:51 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 spec/frontend/notes/old_notes_spec.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'spec/frontend/notes/old_notes_spec.js')

diff --git a/spec/frontend/notes/old_notes_spec.js b/spec/frontend/notes/old_notes_spec.js
index 5f7a5d57cd8..49b887b21b4 100644
--- a/spec/frontend/notes/old_notes_spec.js
+++ b/spec/frontend/notes/old_notes_spec.js
@@ -28,7 +28,10 @@ window.gl = window.gl || {};
 gl.utils = gl.utils || {};
 gl.utils.disableButtonIfEmptyField = () => {};
 
-describe('Old Notes (~/notes.js)', () => {
+// the following test is unreliable and failing in master 2-3 times a day
+// see https://gitlab.com/gitlab-org/gitlab/issues/206906#note_290602581
+// eslint-disable-next-line jest/no-disabled-tests
+describe.skip('Old Notes (~/notes.js)', () => {
   beforeEach(() => {
     jest.useFakeTimers();
     loadFixtures(fixture);
-- 
cgit v1.2.1