From ec273b8d069bf3f9a12a2ffde545398cd2967eeb Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Mon, 2 Jan 2017 12:35:15 +0100
Subject: Copy, don't move uploaded avatar files

---
 app/uploaders/avatar_uploader.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'app/uploaders/avatar_uploader.rb')

diff --git a/app/uploaders/avatar_uploader.rb b/app/uploaders/avatar_uploader.rb
index a1ecb7bc00b..265cea2d2c6 100644
--- a/app/uploaders/avatar_uploader.rb
+++ b/app/uploaders/avatar_uploader.rb
@@ -10,4 +10,15 @@ class AvatarUploader < GitlabUploader
   def exists?
     model.avatar.file && model.avatar.file.exists?
   end
+
+  # We set move_to_store and move_to_cache to 'false' to prevent stealing
+  # the avatar file from a project when forking it.
+  # https://gitlab.com/gitlab-org/gitlab-ce/issues/26158
+  def move_to_store
+    false
+  end
+
+  def move_to_cache
+    false
+  end
 end
-- 
cgit v1.2.3