diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-07-15 12:14:37 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-07-15 13:29:53 +0800 |
| commit | fcc7d5c016a75f975c1e66c6be708fc8e7a602c6 (patch) | |
| tree | 9cc9a88ffe0790de0ffb9e2af86820d93ef07b28 | |
| parent | 920fc2e3896de4a4a88689bead6c053029cebd1c (diff) | |
| download | gitlab-ce-fix-comment-race-condition.tar.gz | |
Fix race condition with polling when saving notesfix-comment-race-condition
eTagPoll may not be initialized yet when we save a note.
Polling is initialized only after discussions are loaded
| -rw-r--r-- | app/assets/javascripts/notes/stores/actions.js | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-comment-race-condition.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js index 30eab272aa9..762a87ce0ff 100644 --- a/app/assets/javascripts/notes/stores/actions.js +++ b/app/assets/javascripts/notes/stores/actions.js @@ -357,11 +357,11 @@ export const poll = ({ commit, state, getters, dispatch }) => { }; export const stopPolling = () => { - eTagPoll.stop(); + if (eTagPoll) eTagPoll.stop(); }; export const restartPolling = () => { - eTagPoll.restart(); + if (eTagPoll) eTagPoll.restart(); }; export const fetchData = ({ commit, state, getters }) => { diff --git a/changelogs/unreleased/fix-comment-race-condition.yml b/changelogs/unreleased/fix-comment-race-condition.yml new file mode 100644 index 00000000000..d1f5b8fe01f --- /dev/null +++ b/changelogs/unreleased/fix-comment-race-condition.yml @@ -0,0 +1,5 @@ +--- +title: Fix commenting before discussions are loaded +merge_request: 30724 +author: +type: fixed |