diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-13 11:30:35 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-13 11:30:35 +0300 |
| commit | 8d9e0c0b8c419c024f67b58b4edc1efb2f99ca2e (patch) | |
| tree | cb319cc3b53634c1389a87df0b90c3439c4f017d /app/uploaders/records_uploads.rb | |
| parent | 4666ef683c75b5c053e579010926e03cdffa497f (diff) | |
| parent | 3d42bab71ad293c99d029dfb4f0c9aa0378643d4 (diff) | |
Merge branch '47408-migrateuploadsworker-is-doing-n-1-queries-on-migration' into 'master'
Resolve "`MigrateUploadsWorker` is doing N+1 queries on migration"
Closes #47408
See merge request gitlab-org/gitlab-ce!19547
Diffstat (limited to 'app/uploaders/records_uploads.rb')
| -rw-r--r-- | app/uploaders/records_uploads.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/uploaders/records_uploads.rb b/app/uploaders/records_uploads.rb index 89c74a78835..301f4681fcd 100644 --- a/app/uploaders/records_uploads.rb +++ b/app/uploaders/records_uploads.rb @@ -22,7 +22,7 @@ module RecordsUploads Upload.transaction do uploads.where(path: upload_path).delete_all - upload.destroy! if upload + upload.delete if upload self.upload = build_upload.tap(&:save!) end |