Merge branch '330194-kpaizee-third-party-ui-text' into 'master'

Revise UI text for third-party offers

See merge request gitlab-org/gitlab!64943

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')
+      = _('Third-party offers')
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded ? _('Collapse') : _('Expand')
     %p
-      = _('Control the display of third party offers.')
+      = _('Control whether to display 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 within GitLab'), class: 'form-check-label'
+            = f.label :hide_third_party_offers, _('Do not display offers from third parties'), class: 'form-check-label'
 
       = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

doc/user/admin_area/settings/third_party_offers.md

@@ -5,7 +5,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 type: reference
 ---
 
-# Third party offers **(FREE SELF)**
+# Third-party offers **(FREE SELF)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/20379) in GitLab Free 11.1.
 
@@ -16,8 +16,9 @@ for using [Google Kubernetes Engine](https://cloud.google.com/kubernetes-engine/
 To toggle the display of third-party offers:
 
 1. On the top bar, select **Menu >** **{admin}** **Admin**.
-1. In the left sidebar, select **Settings**, and expand **Third party offers**.
-1. Select **Do not display offers from third parties within GitLab**.
+1. On the left sidebar, select **Settings**, and expand **Third-party offers**.
+1. Select **Do not display offers from third parties**.
+1. Select **Save changes**.
 
 <!-- ## Troubleshooting
 

locale/gitlab.pot

@@ -8736,7 +8736,7 @@ msgstr ""
 msgid "Control emails linked to your account"
 msgstr ""
 
-msgid "Control the display of third party offers."
+msgid "Control whether to display third-party offers in GitLab."
 msgstr ""
 
 msgid "Cookie domain"
@@ -11431,7 +11431,7 @@ msgstr ""
 msgid "Display source"
 msgstr ""
 
-msgid "Do not display offers from third parties within GitLab"
+msgid "Do not display offers from third parties"
 msgstr ""
 
 msgid "Do you want to remove this deploy key?"
@@ -32934,7 +32934,7 @@ msgstr ""
 msgid "Third Party Advisory Link"
 msgstr ""
 
-msgid "Third party offers"
+msgid "Third-party offers"
 msgstr ""
 
 msgid "This %{issuableDisplayName} is locked. Only project members can comment."

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 within GitLab'
+          check 'Do not display offers from third parties'
           click_button 'Save changes'
         end
 

spec/features/projects/clusters/gcp_spec.rb

@@ -214,7 +214,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 within GitLab'
+        check 'Do not display offers from third parties'
         click_button 'Save changes'
       end