diff options
| author | Mike Greiling <mike@pixelcog.com> | 2019-07-15 15:29:06 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2019-07-15 15:29:06 +0000 |
| commit | ca56311d0e8acde5417ec890c74cb684cf96af92 (patch) | |
| tree | 7dfa35a45054b5cbdc58ef9ead9d24549dfaa158 | |
| parent | 6eca380ee39ffa9816a8e2992be7f1330c7a5d37 (diff) | |
| parent | fcc7d5c016a75f975c1e66c6be708fc8e7a602c6 (diff) | |
| download | gitlab-ce-ca56311d0e8acde5417ec890c74cb684cf96af92.tar.gz | |
Merge branch 'fix-comment-race-condition' into 'master'
Fix race condition with polling when saving notes
Closes gitlab-ee#12472
See merge request gitlab-org/gitlab-ce!30724
| -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 |