Merge branch 'sy-incident-setting-recovery-alert-string-change' into 'master'

Rephrase setting for recovery alerts to match expected behavior

See merge request gitlab-org/gitlab!58515

app/assets/javascripts/incidents_settings/constants.js

@@ -43,7 +43,9 @@ export const I18N_ALERT_SETTINGS_FORM = {
     label: __('Send a single email notification to Owners and Maintainers for new alerts.'),
   },
   autoCloseIncidents: {
-    label: __('Automatically close incidents when the associated Prometheus alert resolves.'),
+    label: __(
+      'Automatically close associated incident when a recovery alert notification resolves an alert',
+    ),
   },
 };
 

changelogs/unreleased/sy-incident-setting-recovery-alert-string-change.yml

+---
+title: Change text for incident auto-resolve setting to match behavior
+merge_request: 58515
+author:
+type: changed

locale/gitlab.pot

@@ -4746,7 +4746,7 @@ msgstr ""
 msgid "Automatic deployment rollbacks"
 msgstr ""
 
-msgid "Automatically close incidents when the associated Prometheus alert resolves."
+msgid "Automatically close associated incident when a recovery alert notification resolves an alert"
 msgstr ""
 
 msgid "Automatically create merge requests for vulnerabilities that have fixes available."

spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap

@@ -90,7 +90,7 @@ exports[`Alert integration settings form default state should match the default
         checked="true"
       >
         <span>
-          Automatically close incidents when the associated Prometheus alert resolves.
+          Automatically close associated incident when a recovery alert notification resolves an alert
         </span>
       </gl-form-checkbox-stub>
     </gl-form-group-stub>