summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-02-25 12:55:37 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2016-02-25 12:55:37 +0100
commit3b520efdc7ff00e291464a7c191db12e4d191bfe (patch)
tree8fd90227b012989dc098b1e1fad50346c527889d
parenta39f7b30c5d5fa40408ad572ddbbcbfbe50d8f95 (diff)
downloadgitlab-ce-3b520efdc7ff00e291464a7c191db12e4d191bfe.tar.gz
Moved exists condition in Repository#before_delete
This is only needed when calling the "expire_cache" method as the other expiration methods don't depend on Git data.
-rw-r--r--app/models/repository.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 38438959d40..a214a69d749 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -300,12 +300,10 @@ class Repository
# Runs code just before a repository is deleted.
def before_delete
- # FIXME: a repository not existing shouldn't prevent us from flushing caches.
- if exists?
- expire_cache
- expire_root_ref_cache
- expire_emptiness_caches
- end
+ expire_cache if exists?
+
+ expire_root_ref_cache
+ expire_emptiness_caches
end
# Runs code just before the HEAD of a repository is changed.