Merge branch 'xanf-recovery-settings-only-for-gitlab-com' into 'master'

Remove "Please ensure your account's recovery settings are up to date." message at self-managed instances"

See merge request gitlab-org/gitlab!29672

ee/app/helpers/ee/user_callouts_helper.rb

@@ -61,6 +61,7 @@ module EE
 
     def render_account_recovery_regular_check
       return unless current_user &&
+          ::Gitlab.com? &&
           3.months.ago > current_user.created_at &&
           !user_dismissed?(ACCOUNT_RECOVERY_REGULAR_CHECK, 3.months.ago)
 

ee/changelogs/unreleased/xanf-recovery-settings-only-for-gitlab-com.yml

+---
+title: Restrict prompt to check user account settings only to Gitlab.com
+merge_request: 29672
+author:
+type: changed

ee/spec/features/account_recovery_regular_check_spec.rb

@@ -8,6 +8,7 @@ describe 'Account recovery regular check callout' do
     let(:message) { "Please ensure your account's recovery settings are up to date." }
 
     before do
+      allow(Gitlab).to receive(:com?) { true }
       gitlab_sign_in(user)
     end
 

ee/spec/helpers/ee/user_callouts_helper_spec.rb

@@ -295,18 +295,22 @@ describe EE::UserCalloutsHelper do
     let(:old_user) { create(:user, created_at: 4.months.ago )}
     let(:anonymous) { nil }
 
-    where(:kind_of_user, :dismissed_callout?, :should_render?) do
-      :anonymous | false | false
-      :new_user  | false | false
-      :old_user  | false | true
-      :old_user  | true  | false
+    where(:kind_of_user, :is_gitlab_com?, :dismissed_callout?, :should_render?) do
+      :anonymous | false | false | false
+      :anonymous | true  | false | false
+      :new_user  | false | false | false
+      :new_user  | true  | false | false
+      :old_user  | false | false | false
+      :old_user  | true  | false | true
+      :old_user  | false | true  | false
+      :old_user  | true  | true  | false
     end
 
     with_them do
       before do
         user = send(kind_of_user)
-
         allow(helper).to receive(:current_user).and_return(user)
+        allow(Gitlab).to receive(:com?).and_return(is_gitlab_com?)
         allow(user).to receive(:dismissed_callout?).and_return(dismissed_callout?) if user
       end