diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-30 06:07:30 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-30 06:07:30 +0300 |
commit | dbb27a91536f29550f7714356ab499d318e9d7e2 (patch) | |
tree | ab0aa16d03a04aec036d18cce0992f81d594026e /lib/api/group_avatar.rb | |
parent | e222250937b497b4cf6e9b8e5ddde0097f0e0954 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/group_avatar.rb')
-rw-r--r-- | lib/api/group_avatar.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/api/group_avatar.rb b/lib/api/group_avatar.rb index 8d5d34accf3..9063040c763 100644 --- a/lib/api/group_avatar.rb +++ b/lib/api/group_avatar.rb @@ -18,17 +18,15 @@ module API not_found!('Avatar') if avatar.blank? - filename = File.basename(avatar.file.file) - header( 'Content-Disposition', ActionDispatch::Http::ContentDisposition.format( disposition: 'attachment', - filename: filename + filename: avatar.filename ) ) - present_carrierwave_file!(user_group.avatar) + present_carrierwave_file!(avatar) end end end |