Commit 8537faa8 authored by Imre Farkas's avatar Imre Farkas

Merge branch 'da-fix-ruby-2.7-kwargs-geo-transfer-classes' into 'master'

Fix Ruby 2.7 keyword parameter deprecations in Geo transfer classes

See merge request gitlab-org/gitlab!43798
parents f419a2e3 c1296909
...@@ -13,11 +13,10 @@ module Gitlab ...@@ -13,11 +13,10 @@ module Gitlab
# @param [Upload] upload # @param [Upload] upload
def initialize(file_type, upload) def initialize(file_type, upload)
if upload.local? if upload.local?
super(local_file_attributes(file_type, upload)) super(**local_file_attributes(file_type, upload))
else else
super(remote_file_attributes(file_type, upload)) super(**remote_file_attributes(file_type, upload))
end end
rescue ObjectStorage::RemoteStoreError rescue ObjectStorage::RemoteStoreError
::Gitlab::Geo::Logger.warn "Error trying to transfer a remote object as a local object." ::Gitlab::Geo::Logger.warn "Error trying to transfer a remote object as a local object."
end end
......
...@@ -13,9 +13,9 @@ module Gitlab ...@@ -13,9 +13,9 @@ module Gitlab
# @param [Ci::JobArtifact] job_artifact # @param [Ci::JobArtifact] job_artifact
def initialize(job_artifact) def initialize(job_artifact)
if job_artifact.local_store? if job_artifact.local_store?
super(local_job_artifact_attributes(job_artifact)) super(**local_job_artifact_attributes(job_artifact))
else else
super(remote_job_artifact_attributes(job_artifact)) super(**remote_job_artifact_attributes(job_artifact))
end end
end end
......
...@@ -13,9 +13,9 @@ module Gitlab ...@@ -13,9 +13,9 @@ module Gitlab
# @param [LfsObject] lfs_object # @param [LfsObject] lfs_object
def initialize(lfs_object) def initialize(lfs_object)
if lfs_object.local_store? if lfs_object.local_store?
super(local_lfs_object_attributes(lfs_object)) super(**local_lfs_object_attributes(lfs_object))
else else
super(remote_lfs_object_attributes(lfs_object)) super(**remote_lfs_object_attributes(lfs_object))
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment