diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-31 18:10:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-31 18:10:41 +0300 |
| commit | 2368893df711f330cd210005e616fc3b6003ff31 (patch) | |
| tree | d48874fb1279741f8e97a7f397e46d14ac2df05f /spec/lib/gitlab/phabricator_import | |
| parent | 729eabcb410add9dbcfa46677308003dc95a64d0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/phabricator_import')
| -rw-r--r-- | spec/lib/gitlab/phabricator_import/cache/map_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/phabricator_import/cache/map_spec.rb b/spec/lib/gitlab/phabricator_import/cache/map_spec.rb index 0f760852a68..08ac85c2625 100644 --- a/spec/lib/gitlab/phabricator_import/cache/map_spec.rb +++ b/spec/lib/gitlab/phabricator_import/cache/map_spec.rb @@ -50,7 +50,7 @@ RSpec.describe Gitlab::PhabricatorImport::Cache::Map, :clean_gitlab_redis_cache describe '#set_gitlab_model' do around do |example| - Timecop.freeze { example.run } + freeze_time { example.run } end it 'sets the class and id in redis with a ttl' do |