diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-27 17:11:41 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-05-27 17:11:41 +0000 |
| commit | 051b2bfa4bf5bb2b7322258e369b1157085fdfdc (patch) | |
| tree | 370cae66b451c73d6dbf72c5d67a3041d19f306b | |
| parent | c39ee747dc34909882527bf48c1b9c1e4f9d528a (diff) | |
| parent | 31e5f081e4750008ce731b2ab40c565cd64a477d (diff) | |
| download | gitlab-ce-051b2bfa4bf5bb2b7322258e369b1157085fdfdc.tar.gz | |
Merge branch 'bendyorke-comment-fix' into 'master'
Update notes immediately after closing/reopening
## What does this MR do?
Fixes MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4127 Thanks @bendyorke!
## Are there points in the code the reviewer needs to double check?
Nope.
## Why was this MR needed?
Constant conflicts in that MR
## What are the relevant issue numbers?
## Screenshots (if relevant)
Fixes #15091
See merge request !4323
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index ed454903a8d..cf00bd9a5af 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -115,6 +115,7 @@ v 8.7.6 - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko) - Fix import from GitLab.com to a private instance failure. !4181 - Fix external imports not finding the import data. !4106 + - Fix notification delay when changing status of an issue v 8.7.5 - Fix relative links in wiki pages. !4050 diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index 8131d923677..f8151963fa7 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -114,9 +114,9 @@ class @Notes @refresh() , @pollingInterval - refresh: -> + refresh: => return if @refreshing is true - refreshing = true + @refreshing = true if not document.hidden and document.URL.indexOf(@noteable_url) is 0 @getContent() @@ -134,8 +134,8 @@ class @Notes @renderDiscussionNote(note) else @renderNote(note) - always: => - @refreshing = false + .always () => + @refreshing = false ### Increase @pollingInterval up to 120 seconds on every function call, |