summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-04-04 19:35:39 -0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-04-04 19:35:39 -0300
commitf2005fa56682a5dc3b57d610cb733a34b2e08520 (patch)
tree151024fc9a4ed60da9f28cc616b4f6fbc6ba1baa /app
parenta55fc41657567fc0343fe5cd6fee8c5e20c851ce (diff)
downloadgitlab-ce-f2005fa56682a5dc3b57d610cb733a34b2e08520.tar.gz
Flush repository cache before import project datafix-gh-pr-import
GitHub Pull Requests importer handle with the repository while importing data, we need to make sure that the cached values are valid.
Diffstat (limited to 'app')
-rw-r--r--app/models/repository.rb5
-rw-r--r--app/services/projects/import_service.rb2
2 files changed, 7 insertions, 0 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index e80c2238402..a8e826c9cbf 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -364,6 +364,11 @@ class Repository
expire_tag_count_cache
end
+ def before_import
+ expire_emptiness_caches
+ expire_exists_cache
+ end
+
# Runs code after a repository has been forked/imported.
def after_import
expire_emptiness_caches
diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb
index 2015897dd19..ef15ef6a473 100644
--- a/app/services/projects/import_service.rb
+++ b/app/services/projects/import_service.rb
@@ -46,6 +46,8 @@ module Projects
def import_data
return unless has_importer?
+ project.repository.before_import
+
unless importer.execute
raise Error, 'The remote data could not be imported.'
end