diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-09-06 16:29:48 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-09-06 16:29:48 +0000 |
| commit | 2d16f4794b43966595e8c6b6405b55c60e94e866 (patch) | |
| tree | d07fad75444b3491ee8b215ff65643605b1e770b /app/controllers/concerns | |
| parent | 607a2562380515ddb2909db9d0486b022342add9 (diff) | |
| parent | d2161350cc8f8fc5fd9b486a07d518e76a76cde7 (diff) | |
| download | gitlab-ce-2d16f4794b43966595e8c6b6405b55c60e94e866.tar.gz | |
Merge branch 'ccr/6699_image_for_object_error' into 'master'
Handled exception during file upload
See merge request gitlab-org/gitlab-ce!21528
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/uploads_actions.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb index 434459a225a..bb8c245a5b7 100644 --- a/app/controllers/concerns/uploads_actions.rb +++ b/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 |