Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Reigel <alexis.reigel.ext@siemens.com>2018-04-12 15:11:21 +0300
committerAlexis Reigel <mail@koffeinfrei.org>2018-06-05 17:20:23 +0300
commit256d959729f14094a490c102508e2878c1dd87fc (patch)
tree5ea1e7db73b01687acc7880feda4fa8a2b8d9bd7 /app/controllers
parent46328b1242d6508f7ee13c6b6e40d9aad6af07ea (diff)
ability to get an image's alternative version
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/concerns/uploads_actions.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb
index 80049044124..a62d45db43d 100644
--- a/app/controllers/concerns/uploads_actions.rb
+++ b/app/controllers/concerns/uploads_actions.rb
@@ -31,7 +31,13 @@ module UploadsActions
disposition = uploader.image_or_video? ? 'inline' : 'attachment'
- send_upload(uploader, attachment: uploader.filename, disposition: disposition)
+ 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)
end
private