diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-22 03:11:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-22 03:11:47 +0300 |
commit | 0bdb61ade7f12067dd524463af4f83994f1baa37 (patch) | |
tree | 987819d2a9e915df73874f66c52d1d9cdc889583 /app/services/import | |
parent | 8746f541fbcf2b89b30c3d4a1b290f5679186400 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/import')
-rw-r--r-- | app/services/import/bitbucket_server_service.rb | 7 | ||||
-rw-r--r-- | app/services/import/github_service.rb | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/services/import/bitbucket_server_service.rb b/app/services/import/bitbucket_server_service.rb index 3d961780889..e628e88eaa9 100644 --- a/app/services/import/bitbucket_server_service.rb +++ b/app/services/import/bitbucket_server_service.rb @@ -42,7 +42,8 @@ module Import project_name, target_namespace, current_user, - credentials + credentials, + timeout_strategy ).execute end @@ -74,6 +75,10 @@ module Import @url ||= params[:bitbucket_server_url] end + def timeout_strategy + @timeout_strategy ||= params[:timeout_strategy] || ProjectImportData::PESSIMISTIC_TIMEOUT + end + def allow_local_requests? Gitlab::CurrentSettings.allow_local_requests_from_web_hooks_and_services? end diff --git a/app/services/import/github_service.rb b/app/services/import/github_service.rb index 73e0c229a9c..86c62145a87 100644 --- a/app/services/import/github_service.rb +++ b/app/services/import/github_service.rb @@ -138,6 +138,7 @@ module Import Gitlab::GithubImport::Settings .new(project) .write( + timeout_strategy: params[:timeout_strategy] || ProjectImportData::PESSIMISTIC_TIMEOUT, optional_stages: params[:optional_stages], additional_access_tokens: access_params[:additional_access_tokens] ) |