diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-02-21 19:09:30 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-02-22 17:32:01 +0300 |
| commit | 028562a049f6b5738731be9bedb2b2d9da1b575d (patch) | |
| tree | 930f2815d9d004bfcbfa01e4396db8a0e54e2d5e /app/controllers/concerns | |
| parent | 0922027877ea08b42b171f5ab2c4e35eabf4f734 (diff) | |
Fix 500 error when loading an invalid upload URL
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/uploads_actions.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb index 7ad79a1e56c..3dbfabcae8a 100644 --- a/app/controllers/concerns/uploads_actions.rb +++ b/app/controllers/concerns/uploads_actions.rb @@ -24,7 +24,7 @@ module UploadsActions # - or redirect to its URL # def show - return render_404 unless uploader.exists? + return render_404 unless uploader&.exists? if uploader.file_storage? disposition = uploader.image_or_video? ? 'inline' : 'attachment' @@ -71,6 +71,9 @@ module UploadsActions def build_uploader_from_params uploader = uploader_class.new(model, secret: params[:secret]) + + return nil unless uploader.model_valid? + uploader.retrieve_from_store!(params[:filename]) uploader end |