Merge branch 'revert-056e4ed0' into 'master'

Revert "Merge branch '239031-yo-remove-avatar-blocked-user' into 'master'"

See merge request gitlab-org/gitlab!53061

app/helpers/avatars_helper.rb

@@ -31,10 +31,11 @@ module AvatarsHelper
   end
 
   def avatar_icon_for_user(user = nil, size = nil, scale = 2, only_path: true)
-    return gravatar_icon(nil, size, scale) unless user
-    return default_avatar if user.blocked?
-
+    if user
       user.avatar_url(size: size, only_path: only_path) || default_avatar
+    else
+      gravatar_icon(nil, size, scale)
+    end
   end
 
   def gravatar_icon(user_email = '', size = nil, scale = 2)

changelogs/unreleased/239031-yo-remove-avatar-blocked-user.yml

----
-title: Remove avatar of the blocked user
-merge_request: 52051
-author: Yogi (@yo)
-type: fixed

spec/helpers/avatars_helper_spec.rb

@@ -135,15 +135,6 @@ RSpec.describe AvatarsHelper do
         helper.avatar_icon_for_user(nil, 20, 2)
       end
     end
-
-    context 'for a blocked user' do
-      let(:user) { create(:user, :blocked) }
-
-      it 'returns the default avatar' do
-        expect(helper.avatar_icon_for_user(user).to_s)
-          .to eq(helper.default_avatar)
-      end
-    end
   end
 
   describe '#gravatar_icon' do