diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-28 18:08:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-28 18:08:30 +0000 |
| commit | 7f3f19582b13b4162212bcf0ae72eef63685ffbc (patch) | |
| tree | 3f7123587a68611c5443f05e33b5789c784e3d63 /lib/gitlab/import_export | |
| parent | 1bb7f81e238569fd0fe2b0c4385f1015407a2d59 (diff) | |
| download | gitlab-ce-7f3f19582b13b4162212bcf0ae72eef63685ffbc.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb b/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb index 6c5fba37d7b..fe0ab01e4fd 100644 --- a/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb +++ b/lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb @@ -26,10 +26,10 @@ module Gitlab log_info(message: "Started uploading project", export_size: export_size) upload_duration = Benchmark.realtime do - if Feature.enabled?(:import_export_web_upload_stream) && !project.export_file.file_storage? - upload_project_as_remote_stream - else + if project.export_file.file_storage? handle_response_error(send_file) + else + upload_project_as_remote_stream end end |