Merge branch 'revert-karma-timeout' into 'master'

Increase karma global timeout

See merge request gitlab-org/gitlab-ce!28850

spec/javascripts/notes/components/note_app_spec.js

@@ -195,7 +195,7 @@ describe('note_app', () => {
         setTimeout(() => {
           done();
         });
-      }, 2000);
+      });
     });
 
     describe('discussion note', () => {
@@ -230,7 +230,7 @@ describe('note_app', () => {
         setTimeout(() => {
           done();
         });
-      }, 2000);
+      });
     });
   });
 

spec/javascripts/test_bundle.js

@@ -111,7 +111,7 @@ let longRunningTestTimeoutHandle;
 beforeEach(done => {
   longRunningTestTimeoutHandle = setTimeout(() => {
     done.fail('Test is running too long!');
-  }, 2000);
+  }, 4000);
   done();
 });