diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/models/bulk_imports/export_status.rb | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/models/bulk_imports/export_status.rb')
-rw-r--r-- | app/models/bulk_imports/export_status.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/bulk_imports/export_status.rb b/app/models/bulk_imports/export_status.rb index cae6aad27da..a9750a76987 100644 --- a/app/models/bulk_imports/export_status.rb +++ b/app/models/bulk_imports/export_status.rb @@ -32,10 +32,12 @@ module BulkImports strong_memoize(:export_status) do status = fetch_export_status + relation_export_status = status&.find { |item| item['relation'] == relation } + # Consider empty response as failed export - raise StandardError, 'Empty export status response' unless status&.present? + raise StandardError, 'Empty relation export status' unless relation_export_status&.present? - status.find { |item| item['relation'] == relation } + relation_export_status end rescue StandardError => e { 'status' => Export::FAILED, 'error' => e.message } |