diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 03:05:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-03 03:05:59 +0300 |
| commit | 427b23c12718bea233931431e7d9307881a960c0 (patch) | |
| tree | 5e15672783c950a5e68dd89517d7888e652e01a7 /app/workers | |
| parent | 6d60f910762c1a92a07a4afaf1b26962f75ee4b6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/import_issues_csv_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/object_storage/background_move_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/object_storage/migrate_uploads_worker.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/workers/import_issues_csv_worker.rb b/app/workers/import_issues_csv_worker.rb index d44fdfec8ae..b9d7099af71 100644 --- a/app/workers/import_issues_csv_worker.rb +++ b/app/workers/import_issues_csv_worker.rb @@ -12,7 +12,7 @@ class ImportIssuesCsvWorker @project = Project.find(project_id) @upload = Upload.find(upload_id) - importer = Issues::ImportCsvService.new(@user, @project, @upload.build_uploader) + importer = Issues::ImportCsvService.new(@user, @project, @upload.retrieve_uploader) importer.execute @upload.destroy diff --git a/app/workers/object_storage/background_move_worker.rb b/app/workers/object_storage/background_move_worker.rb index 8dff65e46e3..19ccae7739c 100644 --- a/app/workers/object_storage/background_move_worker.rb +++ b/app/workers/object_storage/background_move_worker.rb @@ -22,7 +22,7 @@ module ObjectStorage def build_uploader(subject, mount_point) case subject - when Upload then subject.build_uploader(mount_point) + when Upload then subject.retrieve_uploader(mount_point) else subject.send(mount_point) # rubocop:disable GitlabSecurity/PublicSend end diff --git a/app/workers/object_storage/migrate_uploads_worker.rb b/app/workers/object_storage/migrate_uploads_worker.rb index 55ac7cd9b3c..c9fd19cf9d7 100644 --- a/app/workers/object_storage/migrate_uploads_worker.rb +++ b/app/workers/object_storage/migrate_uploads_worker.rb @@ -119,7 +119,7 @@ module ObjectStorage end def build_uploaders(uploads) - uploads.map { |upload| upload.build_uploader(@mounted_as) } + uploads.map { |upload| upload.retrieve_uploader(@mounted_as) } end def migrate(uploads) |