diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/controllers/concerns/notes_actions.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/controllers/concerns/notes_actions.rb')
-rw-r--r-- | app/controllers/concerns/notes_actions.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb index d4b0d3b2674..d3dfb1813e4 100644 --- a/app/controllers/concerns/notes_actions.rb +++ b/app/controllers/concerns/notes_actions.rb @@ -13,9 +13,7 @@ module NotesActions end def index - current_fetched_at = Time.current.to_i - - notes_json = { notes: [], last_fetched_at: current_fetched_at } + notes_json = { notes: [], last_fetched_at: Time.current.to_i } notes = notes_finder .execute @@ -24,7 +22,7 @@ module NotesActions if notes_filter != UserPreference::NOTES_FILTERS[:only_comments] notes = ResourceEvents::MergeIntoNotesService - .new(noteable, current_user, last_fetched_at: current_fetched_at) + .new(noteable, current_user, last_fetched_at: last_fetched_at) .execute(notes) end |