Patch Project, Group and User to display correct avatar from Primary node

app/helpers/groups_helper.rb

@@ -8,11 +8,7 @@ module GroupsHelper
       group = Group.find_by(path: group)
     end
 
-    if group && group.avatar.present?
-      group.avatar.url
-    else
-      image_path('no_group_avatar.png')
-    end
+    group.try(:avatar_url) || image_path('no_group_avatar.png')
   end
 
   def group_title(group, name = nil, url = nil)

app/models/ee/group.rb

-# Group EE mixin
-#
-# This module is intended to encapsulate EE-specific model logic
-# and be included in the `Group` model
 module EE
+  # Group EE mixin
+  #
+  # This module is intended to encapsulate EE-specific model logic
+  # and be included in the `Group` model
   module Group
     extend ActiveSupport::Concern
 
     included do
+      prepend GeoFeatures
+
       state_machine :ldap_sync_status, namespace: :ldap_sync, initial: :ready do
         state :ready
         state :started
@@ -55,5 +57,15 @@ module EE
       fail_ldap_sync
       update_column(:ldap_sync_error, ::Gitlab::UrlSanitizer.sanitize(error_message))
     end
+
+    module GeoFeatures
+      def avatar_url(size = nil)
+        if self[:avatar].present? && ::Gitlab::Geo.secondary?
+          File.join(::Gitlab::Geo.primary_node.url, avatar.url)
+        else
+          super
+        end
+      end
+    end
   end
 end

app/models/ee/project.rb

+module EE
+  # Project EE mixin
+  #
+  # This module is intended to encapsulate EE-specific model logic
+  # and be **prepended** in the `Project` model
+  module Project
+    # Display correct avatar in a secondary Geo node
+    def avatar_url
+      if self[:avatar].present? && ::Gitlab::Geo.secondary?
+        File.join(::Gitlab::Geo.primary_node.url, avatar.url)
+      else
+        super
+      end
+    end
+  end
+end

app/models/ee/user.rb

+module EE
+  # User EE mixin
+  #
+  # This module is intended to encapsulate EE-specific model logic
+  # and be **prepended** in the `User` model
+  module User
+    def avatar_url(size = nil, scale = 2)
+      if self[:avatar].present? && ::Gitlab::Geo.secondary?
+        File.join(::Gitlab::Geo.primary_node.url, avatar.url)
+      else
+        super
+      end
+    end
+  end
+end

app/models/project.rb

@@ -15,6 +15,7 @@ class Project < ActiveRecord::Base
   include Elastic::ProjectsSearch
   include ProjectFeaturesCompatibility
   include SelectForProjectAuthorization
+  prepend EE::Project
 
   extend Gitlab::ConfigHelper
 

app/models/user.rb

@@ -9,6 +9,7 @@ class User < ActiveRecord::Base
   include Sortable
   include CaseSensitivity
   include TokenAuthenticatable
+  prepend EE::User
 
   DEFAULT_NOTIFICATION_LEVEL = :participating
 

changelogs/unreleased-ee/geo-display-custom-avatars.yml

+---
+title: Geo: Display Custom Avatars in secondary nodes
+merge_request: 904
+author:

lib/ee/workers/project_cache_worker.rb

@@ -18,7 +18,7 @@ module EE
       # Geo should only update Redis based cache, as data store in the database
       # will be updated on primary and replicated to the secondaries.
       def perform_geo_secondary(project_id, refresh = [])
-        project = Project.find_by(id: project_id)
+        project = ::Project.find_by(id: project_id)
 
         return unless project && project.repository.exists?