diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
| commit | 419c53ec62de6e97a517abd5fdd4cbde3a942a34 (patch) | |
| tree | 1f43a548b46bca8a5fb8fe0c31cef1883d49c5b6 /lib/gitlab/github_import/settings.rb | |
| parent | 1da20d9135b3ad9e75e65b028bffc921aaf8deb7 (diff) | |
Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42
Diffstat (limited to 'lib/gitlab/github_import/settings.rb')
| -rw-r--r-- | lib/gitlab/github_import/settings.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/gitlab/github_import/settings.rb b/lib/gitlab/github_import/settings.rb index 73a5f49a9e3..a4170f4147f 100644 --- a/lib/gitlab/github_import/settings.rb +++ b/lib/gitlab/github_import/settings.rb @@ -61,8 +61,11 @@ module Gitlab additional_access_tokens: user_settings[:additional_access_tokens] ) - import_data = project.create_or_update_import_data( - data: { optional_stages: optional_stages }, + import_data = project.build_or_assign_import_data( + data: { + optional_stages: optional_stages, + timeout_strategy: user_settings[:timeout_strategy] + }, credentials: credentials ) |