Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

1 files changed, 1 insertions, 5 deletions

diff --git a/app/helpers/avatars_helper.rb b/app/helpers/avatars_helper.rb
index 8d22bda279f..09f91f350bd 100644
--- a/app/helpers/avatars_helper.rb
+++ b/app/helpers/avatars_helper.rb
@@ -24,11 +24,7 @@ module AvatarsHelper
   def avatar_icon_for_email(email = nil, size = nil, scale = 2, only_path: true)
     return gravatar_icon(email, size, scale) if email.nil?
 
-    if Feature.enabled?(:avatar_cache_for_email, @current_user, type: :development)
-      Gitlab::AvatarCache.by_email(email, size, scale, only_path) do
-        avatar_icon_by_user_email_or_gravatar(email, size, scale, only_path: only_path)
-      end
-    else
+    Gitlab::AvatarCache.by_email(email, size, scale, only_path) do
       avatar_icon_by_user_email_or_gravatar(email, size, scale, only_path: only_path)
     end
   end