Merge branch 'tc-fix-38088' into 'master'

Ensure a valid mount_point is used by the AvatarUploader

See merge request gitlab-org/gitlab!24800

app/uploaders/avatar_uploader.rb

@@ -25,6 +25,10 @@ class AvatarUploader < GitlabUploader
     self.class.absolute_path(upload)
   end
 
+  def mounted_as
+    super || 'avatar'
+  end
+
   private
 
   def dynamic_segment

changelogs/unreleased/tc-fix-38088.yml

+---
+title: Ensure a valid mount_point is used by the AvatarUploader
+merge_request: 24800
+author:
+type: fixed

ee/spec/requests/api/geo_spec.rb

@@ -139,6 +139,18 @@ describe API::Geo do
           expect(response).to have_gitlab_http_status(404)
         end
       end
+
+      context 'avatar has mount_point nil' do
+        it 'responds with 200 with X-Sendfile' do
+          upload.update(mount_point: nil)
+
+          get api("/geo/transfers/avatar/#{upload.id}"), headers: req_header
+
+          expect(response).to have_gitlab_http_status(200)
+          expect(response.headers['Content-Type']).to eq('application/octet-stream')
+          expect(response.headers['X-Sendfile']).to eq(user.avatar.path)
+        end
+      end
     end
 
     describe 'GET /geo/transfers/file/1' do