Merge branch...

Merge branch '212213-eurie-remove-check-for-gitlab-employee-badge-in-spam-allowlisting' into 'master'

Remove check for gitlab employee badge feature

See merge request gitlab-org/gitlab!64343

ee/app/helpers/ee/issuables_helper.rb

@@ -47,7 +47,7 @@ module EE
     end
 
     def gitlab_team_member_badge(author, css_class: nil)
-      return unless author.gitlab_employee?
+      return unless author.gitlab_employee? && ::Feature.enabled?(:gitlab_employee_badge)
 
       default_css_class = 'd-inline-block align-middle'
       gitlab_team_member = _('GitLab Team Member')

ee/app/models/ee/user.rb

@@ -339,7 +339,7 @@ module EE
 
     def gitlab_employee?
       strong_memoize(:gitlab_employee) do
-        ::Gitlab.com? && ::Feature.enabled?(:gitlab_employee_badge) && gitlab_team_member?
+        ::Gitlab.com? && gitlab_team_member?
       end
     end
 

ee/app/presenters/epic_presenter.rb

@@ -131,7 +131,7 @@ class EpicPresenter < Gitlab::View::Presenter::Delegated
       url: user_path(epic.author),
       username: "@#{epic.author.username}",
       src: author_icon,
-      is_gitlab_employee: epic.author.gitlab_employee?
+      is_gitlab_employee: epic.author.gitlab_employee? && ::Feature.enabled?(:gitlab_employee_badge)
     }
   end
 

ee/app/serializers/ee/note_user_entity.rb

@@ -5,7 +5,7 @@ module EE
     extend ActiveSupport::Concern
 
     prepended do
-      expose :gitlab_employee?, as: :is_gitlab_employee, if: ->(user, options) { user.gitlab_employee? }
+      expose :gitlab_employee?, as: :is_gitlab_employee, if: ->(user, options) { user.gitlab_employee? && ::Feature.enabled?(:gitlab_employee_badge) }
     end
   end
 end

ee/spec/models/ee/user_spec.rb

@@ -1467,18 +1467,6 @@ RSpec.describe User do
         it { is_expected.to be false }
       end
     end
-
-    context 'when `:gitlab_employee_badge` feature flag is disabled' do
-      let(:user) { create(:user) }
-
-      before do
-        allow(Gitlab).to receive(:com?).and_return(true)
-        stub_feature_flags(gitlab_employee_badge: false)
-        gitlab_group.add_user(user, Gitlab::Access::DEVELOPER)
-      end
-
-      it { is_expected.to be false }
-    end
   end
 
   describe '#gitlab_bot?' do