Merge branch 'dennis-update-webhooks-page-from-whitelist-to-allowlist' into 'master'

Update local IP address and domain name allow list input label

See merge request gitlab-org/gitlab!33812

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

@@ -14,10 +14,10 @@
 
     .form-group
       = f.label :outbound_local_requests_whitelist_raw, class: 'label-bold' do
-        = _('Whitelist to allow requests to the local network from hooks and services')
+        = _('Local IP addresses and domain names that hooks and services may access.')
       = f.text_area :outbound_local_requests_whitelist_raw, placeholder: "example.com, 192.168.1.1", class: 'form-control', rows: 8
       %span.form-text.text-muted
-        = _('Requests to these domain(s)/address(es) on the local network will be allowed when local requests from hooks and services are not allowed. IP ranges such as 1:0:0:0:0:0:0:0/124 or 127.0.0.0/28 are supported. Domain wildcards are not supported currently. Use comma, semicolon, or newline to separate multiple entries. The whitelist can hold a maximum of 1000 entries. Domains should use IDNA encoding. Ex: example.com, 192.168.1.1, 127.0.0.0/28, xn--itlab-j1a.com.')
+        = _('Requests to these domain(s)/address(es) on the local network will be allowed when local requests from hooks and services are not allowed. IP ranges such as 1:0:0:0:0:0:0:0/124 or 127.0.0.0/28 are supported. Domain wildcards are not supported currently. Use comma, semicolon, or newline to separate multiple entries. The allowlist can hold a maximum of 1000 entries. Domains should use IDNA encoding. Ex: example.com, 192.168.1.1, 127.0.0.0/28, xn--itlab-j1a.com.')
 
     .form-group
       .form-check

changelogs/unreleased/dennis-update-webhooks-page-from-whitelist-to-allowlist.yml

+---
+title: Update local IP address and domain name allow list input label
+merge_request: 33812
+author:
+type: changed

locale/gitlab.pot

@@ -13168,6 +13168,9 @@ msgstr ""
 msgid "Loading…"
 msgstr ""
 
+msgid "Local IP addresses and domain names that hooks and services may access."
+msgstr ""
+
 msgid "Localization"
 msgstr ""
 
@@ -18597,7 +18600,7 @@ msgstr ""
 msgid "Requests Profiles"
 msgstr ""
 
-msgid "Requests to these domain(s)/address(es) on the local network will be allowed when local requests from hooks and services are not allowed. IP ranges such as 1:0:0:0:0:0:0:0/124 or 127.0.0.0/28 are supported. Domain wildcards are not supported currently. Use comma, semicolon, or newline to separate multiple entries. The whitelist can hold a maximum of 1000 entries. Domains should use IDNA encoding. Ex: example.com, 192.168.1.1, 127.0.0.0/28, xn--itlab-j1a.com."
+msgid "Requests to these domain(s)/address(es) on the local network will be allowed when local requests from hooks and services are not allowed. IP ranges such as 1:0:0:0:0:0:0:0/124 or 127.0.0.0/28 are supported. Domain wildcards are not supported currently. Use comma, semicolon, or newline to separate multiple entries. The allowlist can hold a maximum of 1000 entries. Domains should use IDNA encoding. Ex: example.com, 192.168.1.1, 127.0.0.0/28, xn--itlab-j1a.com."
 msgstr ""
 
 msgid "Require all users in this group to setup Two-factor authentication"
@@ -25000,9 +25003,6 @@ msgstr ""
 msgid "White helpers give contextual information."
 msgstr ""
 
-msgid "Whitelist to allow requests to the local network from hooks and services"
-msgstr ""
-
 msgid "Who can be an approver?"
 msgstr ""