summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-07-06 13:14:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-07-06 13:14:47 +0000
commit7ab0cadbbdf42fdd316941b3260e294577d649f4 (patch)
tree26ed9d750eb7706174afddb43a9e6fab210f2176 /lib
parent3aad3a0b6ffb1a0fe36db41f81e8bbd3728e5f80 (diff)
downloadgitlab-ce-7ab0cadbbdf42fdd316941b3260e294577d649f4.tar.gz
Add latest changes from gitlab-org/gitlab@14-0-stable-ee
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/local_and_remote_storage_migration/base_migrater.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/local_and_remote_storage_migration/base_migrater.rb b/lib/gitlab/local_and_remote_storage_migration/base_migrater.rb
index f859d293e76..0484957a6fe 100644
--- a/lib/gitlab/local_and_remote_storage_migration/base_migrater.rb
+++ b/lib/gitlab/local_and_remote_storage_migration/base_migrater.rb
@@ -8,7 +8,7 @@ module Gitlab
end
def migrate_to_remote_storage
- logger.info('Starting transfer to remote storage')
+ logger.info('Starting transfer to object storage')
migrate(items_with_files_stored_locally, ObjectStorage::Store::REMOTE)
end
@@ -38,11 +38,11 @@ module Gitlab
end
def log_success(item, store)
- logger.info("Transferred #{item.class.name} ID #{item.id} of type #{item.file_type} with size #{item.size} to #{storage_label(store)} storage")
+ logger.info("Transferred #{item.class.name} ID #{item.id} with size #{item.size} to #{storage_label(store)} storage")
end
def log_error(err, item)
- logger.warn("Failed to transfer #{item.class.name} of type #{item.file_type} and ID #{item.id} with error: #{err.message}")
+ logger.warn("Failed to transfer #{item.class.name} ID #{item.id} with error: #{err.message}")
end
def storage_label(store)