Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 13 deletions

diff --git a/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
index 26ff4aa657b..c3fd4a9bab2 100644
--- a/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
+++ b/spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap
@@ -17,7 +17,7 @@ exports[`Alert integration settings form default state should match the default
         data-qa-selector="create_issue_checkbox"
       >
         <span>
-          Create an issue. Issues are created for each alert triggered.
+          Create an incident. Incidents are created for each alert triggered.
         </span>
       </gl-form-checkbox-stub>
     </gl-form-group-stub>
@@ -32,7 +32,7 @@ exports[`Alert integration settings form default state should match the default
         for="alert-integration-settings-issue-template"
       >
         
-        Issue template (optional)
+        Incident template (optional)
         
         <gl-link-stub
           href="/help/user/project/description_templates#creating-issue-templates"
@@ -89,7 +89,7 @@ exports[`Alert integration settings form default state should match the default
         checked="true"
       >
         <span>
-          Automatically close incident issues when the associated Prometheus alert resolves.
+          Automatically close incidents when the associated Prometheus alert resolves.
         </span>
       </gl-form-checkbox-stub>
     </gl-form-group-stub>
diff --git a/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
index 273356151fc..f0eb54c1b3a 100644
--- a/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
+++ b/spec/frontend/incidents_settings/components/__snapshots__/pagerduty_form_spec.js.snap
@@ -5,7 +5,9 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
   <!---->
    
   <p>
-    Setting up a webhook with PagerDuty will automatically create a GitLab issue for each PagerDuty incident.
+    <gl-sprintf-stub
+      message="Create a GitLab incident for each PagerDuty incident by %{linkStart}configuring a webhook in PagerDuty%{linkEnd}"
+    />
   </p>
    
   <form>
@@ -33,18 +35,10 @@ exports[`Alert integration settings form should match the default snapshot 1`] =
         value="pagerduty.webhook.com"
       />
        
-      <div
-        class="gl-text-gray-200 gl-pt-2"
-      >
-        <gl-sprintf-stub
-          message="Create a GitLab issue for each PagerDuty incident by %{docsLink}"
-        />
-      </div>
-       
       <gl-button-stub
         buttontextclasses=""
         category="primary"
-        class="gl-mt-3"
+        class="gl-mt-5"
         data-testid="webhook-reset-btn"
         icon=""
         role="button"