fix avatar uploader error

2 files changed, 9 insertions, 1 deletions

diff --git a/app/uploaders/avatar_uploader.rb b/app/uploaders/avatar_uploader.rb
index 8526bc16390..c0165759203 100644
--- a/app/uploaders/avatar_uploader.rb
+++ b/app/uploaders/avatar_uploader.rb
@@ -19,7 +19,7 @@ class AvatarUploader < GitlabUploader
   end
 
   def absolute_path
-    self.class.absolute_path(model.avatar)
+    self.class.absolute_path(model.avatar.upload)
   end
 
   private
diff --git a/spec/uploaders/avatar_uploader_spec.rb b/spec/uploaders/avatar_uploader_spec.rb
index b0468bc35ff..6aaec7a4fef 100644
--- a/spec/uploaders/avatar_uploader_spec.rb
+++ b/spec/uploaders/avatar_uploader_spec.rb
@@ -35,5 +35,13 @@ describe AvatarUploader do
 
     it_behaves_like "migrates", to_store: described_class::Store::REMOTE
     it_behaves_like "migrates", from_store: described_class::Store::REMOTE, to_store: described_class::Store::LOCAL
+
+    it 'sets the right absolute path' do
+      storage_path = Gitlab.config.uploads.storage_path
+      absolute_path = File.join(storage_path, upload.path)
+
+      expect(uploader.absolute_path.scan(storage_path).size).to eq(1)
+      expect(uploader.absolute_path).to eq(absolute_path)
+    end
   end
 end