Merge branch 'ccr/6699_image_for_object_error' into 'master'

Handled exception during file upload

See merge request gitlab-org/gitlab-ce!21528

app/controllers/concerns/uploads_actions.rb

@@ -53,6 +53,8 @@ module UploadsActions
       maximum_size: Gitlab::CurrentSettings.max_attachment_size.megabytes.to_i)
 
     render json: authorized
+  rescue SocketError
+    render json: "Error uploading file", status: :internal_server_error
   end
 
   private

changelogs/unreleased/ccr-6699_image_for_object_error.yml

+---
+title: Handles exception during file upload - replaces the stack trace with a small
+  error message.
+merge_request: 21528
+author:
+type: fixed

spec/controllers/projects/uploads_controller_spec.rb

@@ -18,6 +18,20 @@ describe Projects::UploadsController do
     end
   end
 
+  context "when exception occurs" do
+    before do
+      allow(FileUploader).to receive(:workhorse_authorize).and_raise(SocketError.new)
+      sign_in(create(:user))
+    end
+
+    it "responds with status internal_server_error" do
+      post_authorize
+
+      expect(response).to have_gitlab_http_status(500)
+      expect(response.body).to eq('Error uploading file')
+    end
+  end
+
   def post_authorize(verified: true)
     request.headers.merge!(workhorse_internal_api_request_header) if verified