diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 18:08:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 18:08:22 +0000 |
commit | 123c68a7cf788ace140e57e478a12c5b7ac893ae (patch) | |
tree | b36e565ecd895ee46c1713f3734308cfce0e6ba9 /app/controllers | |
parent | 862d225ca0d8eb452e56b8fe5a0109aac796e872 (diff) | |
download | gitlab-ce-123c68a7cf788ace140e57e478a12c5b7ac893ae.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/concerns/uploads_actions.rb | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb index 9b3b2c4a482..655575e0944 100644 --- a/app/controllers/concerns/uploads_actions.rb +++ b/app/controllers/concerns/uploads_actions.rb @@ -44,15 +44,14 @@ module UploadsActions expires_in ttl, directives - disposition = uploader.embeddable? ? 'inline' : 'attachment' - - uploaders = [uploader, *uploader.versions.values] - uploader = uploaders.find { |version| version.filename == params[:filename] } + file_uploader = [uploader, *uploader.versions.values].find do |version| + version.filename == params[:filename] + end - return render_404 unless uploader + return render_404 unless file_uploader workhorse_set_content_type! - send_upload(uploader, attachment: uploader.filename, disposition: disposition) + send_upload(file_uploader, attachment: file_uploader.filename, disposition: content_disposition) end def authorize @@ -83,6 +82,14 @@ module UploadsActions end end + def content_disposition + if uploader.embeddable? || uploader.pdf? + 'inline' + else + 'attachment' + end + end + def uploader_class raise NotImplementedError end |