diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-07-04 09:06:31 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-07-04 09:06:31 +0300 |
| commit | 523f69ee6ba6cc4088b97a50126d28a36dcc4c99 (patch) | |
| tree | 568edfa707f355ab29b511cdb89c79f7cbd4aa55 /app | |
| parent | ffdb1c1b100b9fd05fdcc790116250c85aa45ca8 (diff) | |
| parent | 76b0518f334090294d4ad7db7be64846f6018e80 (diff) | |
Merge branch '53357-fix-plus-in-upload-file-names' into 'master'
Use GitlabUploader#filename when generating upload URLs
See merge request gitlab-org/gitlab-ce!29915
Diffstat (limited to 'app')
| -rw-r--r-- | app/uploaders/file_uploader.rb | 2 | ||||
| -rw-r--r-- | app/uploaders/personal_file_uploader.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb index 1c7582533ad..b326b266017 100644 --- a/app/uploaders/file_uploader.rb +++ b/app/uploaders/file_uploader.rb @@ -203,6 +203,6 @@ class FileUploader < GitlabUploader end def secure_url - File.join('/uploads', @secret, file.filename) + File.join('/uploads', @secret, filename) end end diff --git a/app/uploaders/personal_file_uploader.rb b/app/uploaders/personal_file_uploader.rb index b43162f0935..1ac69601d18 100644 --- a/app/uploaders/personal_file_uploader.rb +++ b/app/uploaders/personal_file_uploader.rb @@ -93,6 +93,6 @@ class PersonalFileUploader < FileUploader end def secure_url - File.join('/', base_dir, secret, file.filename) + File.join('/', base_dir, secret, filename) end end |