Merge branch 'new-group-page/hide-personalization-questions' into 'master'

New Group page: allow to hide personalization questions

See merge request gitlab-org/gitlab!76920

app/views/admin/application_settings/_third_party_offers.html.haml

@@ -2,11 +2,11 @@
 %section.settings.as-third-party-offers.no-animate#js-third-party-offers-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h4
-      = _('Third-party offers')
+      = _('Customer experience improvement and third-party offers')
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = _('Control whether to display third-party offers in GitLab.')
+      = _('Control whether to display customer experience improvement content and third-party offers in GitLab.')
   .settings-content
     = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-third-party-offers-settings'), html: { class: 'fieldset-form', id: 'third-party-offers-settings' } do |f|
       = form_errors(@application_setting) if expanded
@@ -15,6 +15,6 @@
         .form-group
           .form-check
             = f.check_box :hide_third_party_offers, class: 'form-check-input'
-            = f.label :hide_third_party_offers, _('Do not display offers from third parties'), class: 'form-check-label'
+            = f.label :hide_third_party_offers, _('Do not display content for customer experience improvement and offers from third parties'), class: 'form-check-label'
 
       = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

app/views/groups/_new_group_fields.html.haml

@@ -14,7 +14,8 @@
   .row
     = render 'create_chat_team', f: f
 
-= render 'personalize', f: f
+- unless Gitlab::CurrentSettings.current_application_settings.hide_third_party_offers?
+  = render 'personalize', f: f
 
 .row.js-invite-members-section
   .col-sm-4

doc/administration/index.md

@@ -55,7 +55,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
 - [File hooks](file_hooks.md): With custom file hooks, GitLab administrators can
   introduce custom integrations without modifying GitLab source code.
 - [Enforcing Terms of Service](../user/admin_area/settings/terms.md)
-- [Third party offers](../user/admin_area/settings/third_party_offers.md)
+- [Customer experience improvement and third-party offers](../user/admin_area/settings/third_party_offers.md)
 - [Compliance](compliance.md): A collection of features from across the
   application that you may configure to help ensure that your GitLab instance
   and DevOps workflow meet compliance standards.

doc/user/admin_area/settings/index.md

@@ -91,7 +91,8 @@ The **Integrations** settings contain:
   Slack integration allows you to interact with GitLab via slash commands in a chat window.
   This option is only available on GitLab.com, though it may be
   [available for self-managed instances in the future](https://gitlab.com/gitlab-org/gitlab/-/issues/28164).
-- [Third party offers](third_party_offers.md) - Control the display of third-party offers.
+- [Customer experience improvement and third-party offers](third_party_offers.md) -
+  Control the display of customer experience improvement content and third-party offers.
 - [Snowplow](../../../development/snowplow/index.md) - Configure the Snowplow integration.
 - [Google GKE](../../project/clusters/add_gke_clusters.md) - Google GKE integration enables
   you to provision GKE clusters from GitLab.

doc/user/admin_area/settings/third_party_offers.md

 ---
-stage: none
-group: unassigned
+stage: Manage
+group: Workspace
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 type: reference
 ---
 
-# Third-party offers **(FREE SELF)**
+# Customer experience improvement and third-party offers **(FREE SELF)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/20379) in GitLab 11.1.
 
@@ -13,11 +13,14 @@ Within GitLab, we inform users of available third-party offers they might find v
 to enhance the development of their projects. An example is the Google Cloud Platform free credit
 for using [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/).
 
-To toggle the display of third-party offers:
+Furthermore, we use content to improve customer experience. An example are the personalization 
+questions when creating a group.
+
+To toggle the display of customer experience improvement content and third-party offers:
 
 1. On the top bar, select **Menu > Admin**.
-1. On the left sidebar, select **Settings**, and expand **Third-party offers**.
-1. Select **Do not display offers from third parties**.
+1. On the left sidebar, select **Settings**, and expand **Customer experience improvement & third-party offers**.
+1. Select **Do not display content for customer experience improvement and offers from third parties**.
 1. Select **Save changes**.
 
 <!-- ## Troubleshooting

locale/gitlab.pot

@@ -9631,7 +9631,7 @@ msgstr ""
 msgid "Control how the GitLab Package Registry functions."
 msgstr ""
 
-msgid "Control whether to display third-party offers in GitLab."
+msgid "Control whether to display customer experience improvement content and third-party offers in GitLab."
 msgstr ""
 
 msgid "Control which projects can be accessed by API requests authenticated with this project's CI_JOB_TOKEN CI/CD variable. It is a security risk to disable this feature, because unauthorized projects might attempt to retrieve an active token and access the API."
@@ -10531,6 +10531,9 @@ msgstr ""
 msgid "Customer Relations Organizations"
 msgstr ""
 
+msgid "Customer experience improvement and third-party offers"
+msgstr ""
+
 msgid "Customer relations"
 msgstr ""
 
@@ -12616,7 +12619,7 @@ msgstr ""
 msgid "Display time tracking in issues in total hours only."
 msgstr ""
 
-msgid "Do not display offers from third parties"
+msgid "Do not display content for customer experience improvement and offers from third parties"
 msgstr ""
 
 msgid "Do not force push over diverged refs. After the mirror is created, this setting can only be modified using the API. %{mirroring_docs_link_start}Learn more about this option%{link_closing_tag} and %{mirroring_api_docs_link_start}the API.%{link_closing_tag}"
@@ -36023,9 +36026,6 @@ msgstr ""
 msgid "Third Party Advisory Link"
 msgstr ""
 
-msgid "Third-party offers"
-msgstr ""
-
 msgid "This %{issuableDisplayName} is locked. Only project members can comment."
 msgstr ""
 

spec/features/admin/admin_settings_spec.rb

@@ -275,7 +275,7 @@ RSpec.describe 'Admin updates settings' do
 
       it 'enable hiding third party offers' do
         page.within('.as-third-party-offers') do
-          check 'Do not display offers from third parties'
+          check 'Do not display content for customer experience improvement and offers from third parties'
           click_button 'Save changes'
         end
 

spec/features/groups_spec.rb

@@ -171,6 +171,28 @@ RSpec.describe 'Group' do
         expect(page).not_to have_css('.recaptcha')
       end
     end
+
+    describe 'showing personalization questions on group creation when it is enabled' do
+      before do
+        stub_application_setting(hide_third_party_offers: false)
+        visit new_group_path(anchor: 'create-group-pane')
+      end
+
+      it 'renders personalization questions' do
+        expect(page).to have_content('Now, personalize your GitLab experience')
+      end
+    end
+
+    describe 'not showing personalization questions on group creation when it is enabled' do
+      before do
+        stub_application_setting(hide_third_party_offers: true)
+        visit new_group_path(anchor: 'create-group-pane')
+      end
+
+      it 'does not render personalization questions' do
+        expect(page).not_to have_content('Now, personalize your GitLab experience')
+      end
+    end
   end
 
   describe 'create a nested group', :js do

spec/features/projects/clusters/gcp_spec.rb

@@ -219,7 +219,7 @@ RSpec.describe 'Gcp Cluster', :js do
     it 'user does not see the offer' do
       page.within('.as-third-party-offers') do
         click_button 'Expand'
-        check 'Do not display offers from third parties'
+        check 'Do not display content for customer experience improvement and offers from third parties'
         click_button 'Save changes'
       end