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

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

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,