summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorAlexis Reigel <alexis.reigel.ext@siemens.com>2018-04-12 14:13:06 +0200
committerAlexis Reigel <mail@koffeinfrei.org>2018-06-05 16:20:23 +0200
commit96d0b1c67bc1f2a2881298ff898954ba00cd563f (patch)
tree417f03d2417b09ecce912f64d874eaea33525839 /app/controllers
parent256d959729f14094a490c102508e2878c1dd87fc (diff)
downloadgitlab-ce-96d0b1c67bc1f2a2881298ff898954ba00cd563f.tar.gz
require uploaded file's name to match in any case
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/concerns/uploads_actions.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb
index a62d45db43d..98a55a6d82c 100644
--- a/app/controllers/concerns/uploads_actions.rb
+++ b/app/controllers/concerns/uploads_actions.rb
@@ -31,13 +31,17 @@ module UploadsActions
disposition = uploader.image_or_video? ? 'inline' : 'attachment'
+ if uploader.filename == params[:filename]
+ return send_upload(uploader, attachment: uploader.filename, disposition: disposition)
+ end
+
uploader_version = uploader.versions.values.find { |version| version.filename == params[:filename] }
if uploader_version
return send_upload(uploader_version, attachment: uploader_version.filename, disposition: disposition)
end
- return send_upload(uploader, attachment: uploader.filename, disposition: disposition)
+ render_404
end
private