diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-14 12:00:21 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-14 12:00:21 +0200 |
| commit | 0d7986a8c7806a5d7630283f26667f954a5e61f7 (patch) | |
| tree | dd99a049f0d1728fcb4a86a95a5f9afca0cf9cc6 /app/workers | |
| parent | 58e4e6b0819fcb385d790671d44c7a5051787e92 (diff) | |
| parent | 9064fba071d06439ead76890015c3d38ffa63375 (diff) | |
| download | gitlab-ce-0d7986a8c7806a5d7630283f26667f954a5e61f7.tar.gz | |
Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
db/schema.rb
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/repository_import_worker.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index 95b80bca7c0..e66df8c4db1 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -11,11 +11,11 @@ class RepositoryImportWorker project.import_url) if result - project.imported = true + project.import_finish project.save project.satellite.create unless project.satellite.exists? else - project.imported = false + project.import_fail end end end |