Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 4 insertions, 14 deletions

diff --git a/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap b/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap
index 07f90a12f0f..4f70f908c4a 100644
--- a/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap
+++ b/spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`IncidentsSettingTabs should render the component 1`] = `
 <section
-  class="settings no-animate qa-incident-management-settings"
+  class="settings no-animate"
   data-qa-selector="incidents_settings_content"
   id="incident-management-settings"
 >
@@ -30,7 +30,7 @@ exports[`IncidentsSettingTabs should render the component 1`] = `
      
     <p>
       
-      Set up integrations with external tools to help better manage incidents.
+      Fine-tune incident settings and set up integrations with external tools to help better manage incidents.
     
     </p>
   </div>
@@ -41,15 +41,8 @@ exports[`IncidentsSettingTabs should render the component 1`] = `
     <gl-tabs-stub
       theme="indigo"
     >
-      <gl-tab-stub
-        title="Alert integration"
-        titlelinkclass=""
-      >
-        <alertssettingsform-stub
-          class="gl-pt-3"
-          data-testid="AlertsSettingsForm-tab"
-        />
-      </gl-tab-stub>
+      <!---->
+       
       <gl-tab-stub
         title="PagerDuty integration"
         titlelinkclass=""
@@ -59,9 +52,6 @@ exports[`IncidentsSettingTabs should render the component 1`] = `
           data-testid="PagerDutySettingsForm-tab"
         />
       </gl-tab-stub>
-      <!---->
-       
-      <!---->
     </gl-tabs-stub>
   </div>
 </section>