diff options
author | Fatih Acet <acetfatih@gmail.com> | 2019-04-11 22:18:18 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2019-04-11 22:18:18 +0000 |
commit | 396379d8f03dd6fece0c2c3b2bc769249bd0aed9 (patch) | |
tree | beac3aca5762df5c7d6a5a706a4d6ef3a9371f9d | |
parent | e605d8c95d39cb361d69b4a122f9e34bc7d2677d (diff) | |
parent | 4cbca33862bc221bb0f3807d0b7c204e36a13a67 (diff) | |
download | gitlab-ce-396379d8f03dd6fece0c2c3b2bc769249bd0aed9.tar.gz |
Merge branch 'winh-notes_spec-timeout' into 'master'
Increase timeout for notes_spec.js
See merge request gitlab-org/gitlab-ce!27270
-rw-r--r-- | spec/javascripts/notes_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/notes_spec.js b/spec/javascripts/notes_spec.js index 3d2c617e479..394e3343be6 100644 --- a/spec/javascripts/notes_spec.js +++ b/spec/javascripts/notes_spec.js @@ -670,7 +670,7 @@ describe('Notes', function() { done(); }) .catch(done.fail); - }); + }, 2000); }); describe('postComment with Slash commands', () => { |