diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-31 15:10:41 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-31 15:10:41 +0000 |
commit | 2368893df711f330cd210005e616fc3b6003ff31 (patch) | |
tree | d48874fb1279741f8e97a7f397e46d14ac2df05f /spec/controllers/projects/notes_controller_spec.rb | |
parent | 729eabcb410add9dbcfa46677308003dc95a64d0 (diff) | |
download | gitlab-ce-2368893df711f330cd210005e616fc3b6003ff31.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/projects/notes_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/notes_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/notes_controller_spec.rb b/spec/controllers/projects/notes_controller_spec.rb index 570d65dba4f..8c59b2b378f 100644 --- a/spec/controllers/projects/notes_controller_spec.rb +++ b/spec/controllers/projects/notes_controller_spec.rb @@ -98,7 +98,7 @@ RSpec.describe Projects::NotesController do let(:page_2_boundary) { microseconds(page_2.last.updated_at + NotesFinder::FETCH_OVERLAP) } around do |example| - Timecop.freeze do + freeze_time do example.run end end |