Merge branch 'fix_cache_expiration_in_repository' into 'master'

Fix redundant cache expiration in Repository

Closes #30146

See merge request !10575
This commit is contained in:
Robert Speicher 2017-04-10 23:11:00 +00:00
commit 100f437076
3 changed files with 4 additions and 4 deletions

View file

@ -407,8 +407,6 @@ class Repository
# Runs code after a repository has been forked/imported.
def after_import
expire_content_cache
expire_tags_cache
expire_branches_cache
end
# Runs code after a new commit has been pushed.

View file

@ -0,0 +1,4 @@
---
title: Fix redundant cache expiration in Repository
merge_request: 10575
author: blackst0ne

View file

@ -1283,8 +1283,6 @@ describe Repository, models: true do
describe '#after_import' do
it 'flushes and builds the cache' do
expect(repository).to receive(:expire_content_cache)
expect(repository).to receive(:expire_tags_cache)
expect(repository).to receive(:expire_branches_cache)
repository.after_import
end