Add latest changes from gitlab-org/gitlab@master

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