Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 5 insertions, 1 deletions

diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb
index 7a5b470f366..bfa7a30bc65 100644
--- a/app/controllers/concerns/notes_actions.rb
+++ b/app/controllers/concerns/notes_actions.rb
@@ -31,6 +31,10 @@ module NotesActions
     # We know there's more data, so tell the frontend to poll again after 1ms
     set_polling_interval_header(interval: 1) if meta[:more]
 
+    # Only present an ETag for the empty response to ensure pagination works
+    # as expected
+    ::Gitlab::EtagCaching::Middleware.skip!(response) if notes.present?
+
     render json: meta.merge(notes: notes)
   end
 
@@ -115,7 +119,7 @@ module NotesActions
   end
 
   def gather_some_notes
-    paginator = Gitlab::UpdatedNotesPaginator.new(
+    paginator = ::Gitlab::UpdatedNotesPaginator.new(
       notes_finder.execute.inc_relations_for_view,
       last_fetched_at: last_fetched_at
     )