diff options
| author | Greg Stark <stark@gitlab.com> | 2017-12-05 19:26:02 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-12-12 17:50:26 +0100 |
| commit | 946d87d332232e1b4bceeac44ce89d8fd645166e (patch) | |
| tree | f61ecf9868804f871736b827f8cc00bc915d8cf3 /app/models | |
| parent | ad1c186ed386afab578668ccdc21cb02354c81bc (diff) | |
| download | gitlab-ce-946d87d332232e1b4bceeac44ce89d8fd645166e.tar.gz | |
check the import_status field before doing SQL operations to check the import url
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/project.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 4c4ec2226ad..5183a216c53 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -659,7 +659,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? |