BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 3f739428 by Dmitriy Zaporozhets
Options

Merge branch 'prevent_notes_polling' into 'master'

Prevent notes polling when there are not notes See merge request !1132
parents e145f46a 693cee89
Showing with 4 additions and 1 deletion
CHANGELOG
...@@ -8,6 +8,7 @@ v 7.4.0 ...@@ -8,6 +8,7 @@ v 7.4.0
- Sort search autocomplete projects by stars count so most popular go first - Sort search autocomplete projects by stars count so most popular go first
- Do not delete tmp/repositories itself during clean-up, only its contents - Do not delete tmp/repositories itself during clean-up, only its contents
- Support for backup uploads to remote storage - Support for backup uploads to remote storage
- Prevent notes polling when there are not notes
v 7.3.1 v 7.3.1
- Fix ref parsing in Gitlab::GitAccess - Fix ref parsing in Gitlab::GitAccess
......
app/assets/javascripts/notes.js.coffee
...@@ -6,6 +6,7 @@ class Notes ...@@ -6,6 +6,7 @@ class Notes
@notes_url = gon.relative_url_root + @notes_url if gon.relative_url_root? @notes_url = gon.relative_url_root + @notes_url if gon.relative_url_root?
@note_ids = note_ids @note_ids = note_ids
@last_fetched_at = last_fetched_at @last_fetched_at = last_fetched_at
@noteable_url = document.URL
@initRefresh() @initRefresh()
@setupMainTargetNoteForm() @setupMainTargetNoteForm()
@cleanBinding() @cleanBinding()
...@@ -95,7 +96,8 @@ class Notes ...@@ -95,7 +96,8 @@ class Notes
, 15000 , 15000
refresh: -> refresh: ->
@getContent() unless document.hidden unless document.hidden or (@noteable_url != document.URL)
@getContent()
getContent: -> getContent: ->
$.ajax $.ajax
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment