diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-04 12:31:16 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-04-04 12:31:16 +0000 |
| commit | c60d0efe0d2f2f0bdd1e626c378fe655461c5f22 (patch) | |
| tree | 2a203b9618da88c89ad759be079949d0293e4d0d /app | |
| parent | 2fdc7c1fd6884cf120bf82cb870f66d1bf73811a (diff) | |
| parent | ec85debaf51067cc78d54188ec1eef94342d5a8b (diff) | |
| download | gitlab-ce-c60d0efe0d2f2f0bdd1e626c378fe655461c5f22.tar.gz | |
Merge branch 'stop-signing-avatar-paths' into 'master'
Speed up avatar URLs with object storage
Closes #43065
See merge request gitlab-org/gitlab-ce!26858
Diffstat (limited to 'app')
| -rw-r--r-- | app/uploaders/records_uploads.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/uploaders/records_uploads.rb b/app/uploaders/records_uploads.rb index 9a243e07936..00b51f92b12 100644 --- a/app/uploaders/records_uploads.rb +++ b/app/uploaders/records_uploads.rb @@ -46,6 +46,10 @@ module RecordsUploads File.join(store_dir, filename.to_s) end + def filename + upload&.path ? File.basename(upload.path) : super + end + private # rubocop: disable CodeReuse/ActiveRecord |