summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
authorGreg Stark <stark@gitlab.com>2017-12-05 19:26:02 +0000
committerGreg Stark <stark@gitlab.com>2017-12-12 14:10:49 +0000
commit10e00ea0457bf7fc9cfba00c8126cca63ebf0730 (patch)
treeee6920a0493170a73ec562dcae6185e0952458b3 /app/models/project.rb
parent8c77ae2d9eb40d8039f3b142d462f4705a0bf53e (diff)
downloadgitlab-ce-optimize-projects-for-imported-projects.tar.gz
check the import_status field before doing SQL operations to check the import urloptimize-projects-for-imported-projects
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index cc530076bf7..e65c5290699 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -657,7 +657,8 @@ class Project < ActiveRecord::Base
end
def import_started?
- import? && import_status == 'started'
+ # import? does SQL work so only run it if it looks like there's an import running
+ import_status == 'started' && import?
end
def import_scheduled?