Merge branch 'winh-raise-karma-timeout' into 'master'

Raise timeout for Karma tests to 2 seconds

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

spec/javascripts/test_bundle.js

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