Add latest changes from gitlab-org/gitlab@master

3 files changed, 23 insertions, 28 deletions

diff --git a/app/assets/javascripts/incidents_settings/components/alerts_form.vue b/app/assets/javascripts/incidents_settings/components/alerts_form.vue
index 5fe0badc56e..e8daad8811e 100644
--- a/app/assets/javascripts/incidents_settings/components/alerts_form.vue
+++ b/app/assets/javascripts/incidents_settings/components/alerts_form.vue
@@ -86,7 +86,7 @@ export default {
     <form ref="settingsForm" @submit.prevent="updateAlertsIntegrationSettings">
       <gl-form-group class="gl-pl-0">
         <gl-form-checkbox v-model="createIssueEnabled" data-qa-selector="create_issue_checkbox">
-          <span>{{ $options.i18n.createIssue.label }}</span>
+          <span>{{ $options.i18n.createIncident.label }}</span>
         </gl-form-checkbox>
       </gl-form-group>
 
@@ -96,7 +96,7 @@ export default {
         class="col-8 col-md-9 gl-px-6"
       >
         <label class="gl-display-inline-flex" for="alert-integration-settings-issue-template">
-          {{ $options.i18n.issueTemplate.label }}
+          {{ $options.i18n.incidentTemplate.label }}
           <gl-link :href="$options.ISSUE_TEMPLATES_DOCS_LINK" target="_blank">
             <gl-icon name="question" :size="12" />
           </gl-link>
diff --git a/app/assets/javascripts/incidents_settings/components/pagerduty_form.vue b/app/assets/javascripts/incidents_settings/components/pagerduty_form.vue
index 9a8c4bc5af9..b56dd66342a 100644
--- a/app/assets/javascripts/incidents_settings/components/pagerduty_form.vue
+++ b/app/assets/javascripts/incidents_settings/components/pagerduty_form.vue
@@ -109,7 +109,20 @@ export default {
       {{ webhookUpdateAlertMsg }}
     </gl-alert>
 
-    <p>{{ $options.i18n.introText }}</p>
+    <p>
+      <gl-sprintf :message="$options.i18n.introText">
+        <template #link="{ content }">
+          <gl-link
+            :href="$options.CONFIGURE_PAGERDUTY_WEBHOOK_DOCS_LINK"
+            target="_blank"
+            class="gl-display-inline-flex"
+          >
+            <span>{{ content }}</span>
+            <gl-icon name="external-link" />
+          </gl-link>
+        </template>
+      </gl-sprintf>
+    </p>
     <form ref="settingsForm" @submit.prevent="updatePagerDutyIntegrationSettings">
       <gl-form-group class="col-8 col-md-9 gl-p-0">
         <gl-toggle
@@ -134,23 +147,9 @@ export default {
           </template>
         </gl-form-input-group>
 
-        <div class="gl-text-gray-200 gl-pt-2">
-          <gl-sprintf :message="$options.i18n.webhookUrl.helpText">
-            <template #docsLink>
-              <gl-link
-                :href="$options.CONFIGURE_PAGERDUTY_WEBHOOK_DOCS_LINK"
-                target="_blank"
-                class="gl-display-inline-flex"
-              >
-                <span>{{ $options.i18n.webhookUrl.helpDocsLink }}</span>
-                <gl-icon name="external-link" />
-              </gl-link>
-            </template>
-          </gl-sprintf>
-        </div>
         <gl-button
           v-gl-modal.resetWebhookModal
-          class="gl-mt-3"
+          class="gl-mt-5"
           :disabled="loading"
           :loading="resettingWebhook"
           data-testid="webhook-reset-btn"
diff --git a/app/assets/javascripts/incidents_settings/constants.js b/app/assets/javascripts/incidents_settings/constants.js
index 42f1f645d16..fcac9c519c2 100644
--- a/app/assets/javascripts/incidents_settings/constants.js
+++ b/app/assets/javascripts/incidents_settings/constants.js
@@ -33,17 +33,17 @@ export const I18N_ALERT_SETTINGS_FORM = {
   saveBtnLabel: __('Save changes'),
   introText: __('Action to take when receiving an alert. %{docsLink}'),
   introLinkText: __('More information.'),
-  createIssue: {
-    label: __('Create an issue. Issues are created for each alert triggered.'),
+  createIncident: {
+    label: __('Create an incident. Incidents are created for each alert triggered.'),
   },
-  issueTemplate: {
-    label: __('Issue template (optional)'),
+  incidentTemplate: {
+    label: __('Incident template (optional)'),
   },
   sendEmail: {
     label: __('Send a separate email notification to Developers.'),
   },
   autoCloseIncidents: {
-    label: __('Automatically close incident issues when the associated Prometheus alert resolves.'),
+    label: __('Automatically close incidents when the associated Prometheus alert resolves.'),
   },
 };
 
@@ -57,17 +57,13 @@ export const ISSUE_TEMPLATES_DOCS_LINK =
 
 export const I18N_PAGERDUTY_SETTINGS_FORM = {
   introText: s__(
-    'PagerDutySettings|Setting up a webhook with PagerDuty will automatically create a GitLab issue for each PagerDuty incident.',
+    'PagerDutySettings|Create a GitLab incident for each PagerDuty incident by %{linkStart}configuring a webhook in PagerDuty%{linkEnd}',
   ),
   activeToggle: {
     label: s__('PagerDutySettings|Active'),
   },
   webhookUrl: {
     label: s__('PagerDutySettings|Webhook URL'),
-    helpText: s__(
-      'PagerDutySettings|Create a GitLab issue for each PagerDuty incident by %{docsLink}',
-    ),
-    helpDocsLink: s__('PagerDutySettings|configuring a webhook in PagerDuty'),
     resetWebhookUrl: s__('PagerDutySettings|Reset webhook URL'),
     copyToClipboard: __('Copy'),
     updateErrMsg: s__('PagerDutySettings|Failed to update Webhook URL'),