Merge branch 'sh-speed-geo-avatar' into 'master'

Check whether Geo is enabled before checking whether avatar exists

See merge request !1557

app/models/ee/geo_aware_avatar.rb

@@ -5,7 +5,7 @@ module EE
   # and be **prepended** in the `Group`, `User`, `Project` models
   module GeoAwareAvatar
     def avatar_url(size = nil, scale = 2)
-      if self[:avatar].present? && ::Gitlab::Geo.secondary?
+      if ::Gitlab::Geo.secondary? && self[:avatar].present?
         File.join(::Gitlab::Geo.primary_node.url, avatar.url)
       else
         super