Merge branch 'hide-open-registration-callout-on-gitlab-com' into 'master'

Hide open registration callout on gitlab.com

See merge request gitlab-org/gitlab!47865

app/helpers/user_callouts_helper.rb

@@ -57,7 +57,10 @@ module UserCalloutsHelper
   end
 
   def show_registration_enabled_user_callout?
-    current_user&.admin? && signup_enabled? && !user_dismissed?(REGISTRATION_ENABLED_CALLOUT)
+    !Gitlab.com? &&
+    current_user&.admin? &&
+    signup_enabled? &&
+    !user_dismissed?(REGISTRATION_ENABLED_CALLOUT)
   end
 
   private

changelogs/unreleased/hide-open-registration-callout-on-gitlab-com.yml

+---
+title: Hide open registration user callout on gitlab.com
+merge_request: 47865
+author:
+type: changed

spec/helpers/user_callouts_helper_spec.rb

@@ -167,8 +167,20 @@ RSpec.describe UserCalloutsHelper do
 
     subject { helper.show_registration_enabled_user_callout? }
 
+    context 'when on gitlab.com' do
+      before do
+        allow(::Gitlab).to receive(:com?).and_return(true)
+        allow(helper).to receive(:current_user).and_return(admin)
+        stub_application_setting(signup_enabled: true)
+        allow(helper).to receive(:user_dismissed?).with(described_class::REGISTRATION_ENABLED_CALLOUT) { false }
+      end
+
+      it { is_expected.to be false }
+    end
+
     context 'when `current_user` is not an admin' do
       before do
+        allow(::Gitlab).to receive(:com?).and_return(false)
         allow(helper).to receive(:current_user).and_return(user)
         stub_application_setting(signup_enabled: true)
         allow(helper).to receive(:user_dismissed?).with(described_class::REGISTRATION_ENABLED_CALLOUT) { false }
@@ -179,6 +191,7 @@ RSpec.describe UserCalloutsHelper do
 
     context 'when signup is disabled' do
       before do
+        allow(::Gitlab).to receive(:com?).and_return(false)
         allow(helper).to receive(:current_user).and_return(admin)
         stub_application_setting(signup_enabled: false)
         allow(helper).to receive(:user_dismissed?).with(described_class::REGISTRATION_ENABLED_CALLOUT) { false }
@@ -189,6 +202,7 @@ RSpec.describe UserCalloutsHelper do
 
     context 'when user has dismissed callout' do
       before do
+        allow(::Gitlab).to receive(:com?).and_return(false)
         allow(helper).to receive(:current_user).and_return(admin)
         stub_application_setting(signup_enabled: true)
         allow(helper).to receive(:user_dismissed?).with(described_class::REGISTRATION_ENABLED_CALLOUT) { true }
@@ -197,8 +211,9 @@ RSpec.describe UserCalloutsHelper do
       it { is_expected.to be false }
     end
 
-    context 'when `current_user` is an admin, signup is enabled, and user has not dismissed callout' do
+    context 'when not gitlab.com, `current_user` is an admin, signup is enabled, and user has not dismissed callout' do
       before do
+        allow(::Gitlab).to receive(:com?).and_return(false)
         allow(helper).to receive(:current_user).and_return(admin)
         stub_application_setting(signup_enabled: true)
         allow(helper).to receive(:user_dismissed?).with(described_class::REGISTRATION_ENABLED_CALLOUT) { false }