diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-19 18:09:10 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-19 18:09:10 +0000 |
commit | 33795139ea8e72756bee3675b4e16387425e6ab1 (patch) | |
tree | 3ca568fca61482e57810ee30ad5ce4b964a82c4e /app/workers/object_storage | |
parent | c7e385e282bcb8505589bce526e692b7bb819ffa (diff) | |
download | gitlab-ce-33795139ea8e72756bee3675b4e16387425e6ab1.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/object_storage')
-rw-r--r-- | app/workers/object_storage/background_move_worker.rb | 2 | ||||
-rw-r--r-- | app/workers/object_storage/migrate_uploads_worker.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/workers/object_storage/background_move_worker.rb b/app/workers/object_storage/background_move_worker.rb index 55f8e1c3ede..7b0a7c7ec58 100644 --- a/app/workers/object_storage/background_move_worker.rb +++ b/app/workers/object_storage/background_move_worker.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module ObjectStorage - class BackgroundMoveWorker + class BackgroundMoveWorker # rubocop:disable Scalability/IdempotentWorker include ApplicationWorker include ObjectStorageQueue diff --git a/app/workers/object_storage/migrate_uploads_worker.rb b/app/workers/object_storage/migrate_uploads_worker.rb index 01e6fdb2d3e..d9d21f2cb7e 100644 --- a/app/workers/object_storage/migrate_uploads_worker.rb +++ b/app/workers/object_storage/migrate_uploads_worker.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +# rubocop:disable Scalability/IdempotentWorker module ObjectStorage class MigrateUploadsWorker include ApplicationWorker @@ -137,3 +138,4 @@ module ObjectStorage end end end +# rubocop:enable Scalability/IdempotentWorker |