Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/import/gitlab_projects/file_acquisition_strategies')
-rw-r--r--app/services/import/gitlab_projects/file_acquisition_strategies/file_upload.rb2
-rw-r--r--app/services/import/gitlab_projects/file_acquisition_strategies/remote_file.rb2
-rw-r--r--app/services/import/gitlab_projects/file_acquisition_strategies/remote_file_s3.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/services/import/gitlab_projects/file_acquisition_strategies/file_upload.rb b/app/services/import/gitlab_projects/file_acquisition_strategies/file_upload.rb
index 8bee3067d6c..1652bdab5b8 100644
--- a/app/services/import/gitlab_projects/file_acquisition_strategies/file_upload.rb
+++ b/app/services/import/gitlab_projects/file_acquisition_strategies/file_upload.rb
@@ -8,7 +8,7 @@ module Import
validate :uploaded_file
- def initialize(current_user: nil, params:)
+ def initialize(params:, current_user: nil)
@params = params
end
diff --git a/app/services/import/gitlab_projects/file_acquisition_strategies/remote_file.rb b/app/services/import/gitlab_projects/file_acquisition_strategies/remote_file.rb
index ac58711a0ac..e179a14c497 100644
--- a/app/services/import/gitlab_projects/file_acquisition_strategies/remote_file.rb
+++ b/app/services/import/gitlab_projects/file_acquisition_strategies/remote_file.rb
@@ -21,7 +21,7 @@ module Import
# whole condition of this validation:
validates_with RemoteFileValidator, if: -> { validate_aws_s3? || !s3_request? }
- def initialize(current_user: nil, params:)
+ def initialize(params:, current_user: nil)
@params = params
end
diff --git a/app/services/import/gitlab_projects/file_acquisition_strategies/remote_file_s3.rb b/app/services/import/gitlab_projects/file_acquisition_strategies/remote_file_s3.rb
index 5cbca53582d..7599343d4e1 100644
--- a/app/services/import/gitlab_projects/file_acquisition_strategies/remote_file_s3.rb
+++ b/app/services/import/gitlab_projects/file_acquisition_strategies/remote_file_s3.rb
@@ -25,7 +25,7 @@ module Import
# we add an expiration a bit longer to ensure it won't expire during the import.
URL_EXPIRATION = 28.hours.seconds
- def initialize(current_user: nil, params:)
+ def initialize(params:, current_user: nil)
@params = params
end