Add latest changes from gitlab-org/gitlab@master

gems/gitlab-backup-cli/lib/gitlab/backup/cli/tasks/registry.rb

@@ -13,10 +13,25 @@ module Gitlab
 
           def destination_path = 'registry.tar.gz'
 
+          def object_storage?
+            !options.container_registry_bucket.nil?
+          end
+
+          # Registry does not use consolidated object storage config.
+          def config
+            settings = {
+              object_store: {
+                connection: Gitlab::Backup::Cli::SourceContext.new.config('object_store').connection.to_hash,
+                remote_directory: options.container_registry_bucket
+              }
+            }
+            GitlabSettings::Options.build(settings)
+          end
+
           private
 
           def target
-            ::Backup::Targets::Files.new(nil, storage_path, options: options)
+            check_object_storage(::Backup::Targets::Files.new(nil, storage_path, options: options))
           end
 
           def storage_path = context.registry_path