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 'lib/gitlab/github_import/settings.rb')
-rw-r--r--lib/gitlab/github_import/settings.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/gitlab/github_import/settings.rb b/lib/gitlab/github_import/settings.rb
index a4170f4147f..3947ae3c63d 100644
--- a/lib/gitlab/github_import/settings.rb
+++ b/lib/gitlab/github_import/settings.rb
@@ -57,16 +57,13 @@ module Gitlab
user_settings = user_settings.to_h.with_indifferent_access
optional_stages = fetch_stages_from_params(user_settings[:optional_stages])
- credentials = project.import_data&.credentials&.merge(
- additional_access_tokens: user_settings[:additional_access_tokens]
- )
import_data = project.build_or_assign_import_data(
data: {
optional_stages: optional_stages,
timeout_strategy: user_settings[:timeout_strategy]
},
- credentials: credentials
+ credentials: project.import_data&.credentials
)
import_data.save!