Refactor to remove duplicated code in Geo aware avatars

app/models/ee/user.rb → app/models/ee/geo_aware_avatar.rb

 module EE
-  # User EE mixin
+  # Avatars in Geo 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)
+  # This module is intended to encapsulate Geo-specific logic
+  # and be **prepended** in the `Group`, `User`, `Project` models
+  module GeoAwareAvatar
+    def avatar_url(size = nil)
       if self[:avatar].present? && ::Gitlab::Geo.secondary?
         File.join(::Gitlab::Geo.primary_node.url, avatar.url)
       else
-        super
+        super()
       end
     end
   end

app/models/ee/group.rb

@@ -7,8 +7,6 @@ module EE
     extend ActiveSupport::Concern
 
     included do
-      prepend GeoFeatures
-
       state_machine :ldap_sync_status, namespace: :ldap_sync, initial: :ready do
         state :ready
         state :started
@@ -57,15 +55,5 @@ 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/group.rb

@@ -9,6 +9,7 @@ class Group < Namespace
   include AccessRequestable
   include Referable
   include SelectForProjectAuthorization
+  prepend EE::GeoAwareAvatar
 
   has_many :group_members, -> { where(requested_at: nil) }, dependent: :destroy, as: :source
   alias_method :members, :group_members

app/models/project.rb

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

app/models/user.rb

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