Automatic merge of gitlab-org/gitlab-ce master

changelogs/unreleased/fj-60827-fix-web-strategy-error.yml

+---
+title: Fix bug when project export to remote url fails
+merge_request: 27614
+author:
+type: fixed

lib/gitlab/import_export/after_export_strategies/web_upload_strategy.rb

@@ -30,10 +30,7 @@ module Gitlab
 
         def handle_response_error(response)
           unless response.success?
-            error_code = response.dig('Error', 'Code') || response.code
-            error_message = response.dig('Error', 'Message') || response.message
-
-            raise StrategyError.new("Error uploading the project. Code #{error_code}: #{error_message}")
+            raise StrategyError.new("Error uploading the project. Code #{response.code}: #{response.message}")
           end
         end
 

spec/lib/gitlab/import_export/after_export_strategies/web_upload_strategy_spec.rb

@@ -32,5 +32,17 @@ describe Gitlab::ImportExport::AfterExportStrategies::WebUploadStrategy do
 
       strategy.execute(user, project)
     end
+
+    context 'when upload fails' do
+      it 'stores the export error' do
+        stub_request(:post, example_url).to_return(status: [404, 'Page not found'])
+
+        strategy.execute(user, project)
+
+        errors = project.import_export_shared.errors
+        expect(errors).not_to be_empty
+        expect(errors.first).to eq "Error uploading the project. Code 404: Page not found"
+      end
+    end
   end
 end