diff options
| author | João Cunha <j.a.cunha@gmail.com> | 2019-02-26 10:33:32 +0000 |
|---|---|---|
| committer | João Cunha <j.a.cunha@gmail.com> | 2019-02-26 10:33:32 +0000 |
| commit | ed7065bbdb6f6fad3cc8fb369267fa811767c8a5 (patch) | |
| tree | b3fda377c51504a6d21da1742cac3de7fd668ef0 /app/controllers/concerns/send_file_upload.rb | |
| parent | 26c7d04cd06d1126e4a4a7a1c9308d12de77172e (diff) | |
| parent | 094d740886eaf62fd219dacd11aa9a966758a962 (diff) | |
| download | gitlab-ce-ed7065bbdb6f6fad3cc8fb369267fa811767c8a5.tar.gz | |
Merge branch 'master' into 56937-edit-knative-domain-after-it-has-been-deployed56937-edit-knative-domain-after-it-has-been-deployed
Diffstat (limited to 'app/controllers/concerns/send_file_upload.rb')
| -rw-r--r-- | app/controllers/concerns/send_file_upload.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/send_file_upload.rb b/app/controllers/concerns/send_file_upload.rb index 9ca54c5519b..28e4cece548 100644 --- a/app/controllers/concerns/send_file_upload.rb +++ b/app/controllers/concerns/send_file_upload.rb @@ -3,7 +3,7 @@ module SendFileUpload def send_upload(file_upload, send_params: {}, redirect_params: {}, attachment: nil, proxy: false, disposition: 'attachment') if attachment - response_disposition = ::Gitlab::ContentDisposition.format(disposition: 'attachment', filename: attachment) + response_disposition = ::Gitlab::ContentDisposition.format(disposition: disposition, filename: attachment) # Response-Content-Type will not override an existing Content-Type in # Google Cloud Storage, so the metadata needs to be cleared on GCS for |