Merge branch '208330-operations-clean-up-2' into 'master'

Move Incident tab locationi

See merge request gitlab-org/gitlab!62821

app/assets/javascripts/alerts_settings/components/alerts_settings_wrapper.vue

@@ -39,8 +39,8 @@ export default {
   components: {
     IntegrationsList,
     AlertSettingsForm,
-    GlButton,
     GlAlert,
+    GlButton,
   },
   inject: {
     projectPath: {

app/assets/javascripts/incidents_settings/components/incidents_settings_tabs.vue

@@ -42,6 +42,7 @@ export default {
 
     <div class="settings-content">
       <gl-tabs>
+        <service-level-agreement-form />
         <gl-tab
           v-for="(tab, index) in $options.tabs"
           v-if="tab.active"
@@ -50,7 +51,6 @@ export default {
         >
           <component :is="tab.component" class="gl-pt-3" :data-testid="`${tab.component}-tab`" />
         </gl-tab>
-        <service-level-agreement-form />
       </gl-tabs>
     </div>
   </section>

ee/app/assets/javascripts/incidents_settings/components/service_level_agreement_form.vue

@@ -112,6 +112,7 @@ export default {
     v-if="available"
     key="service-level-agreement"
     :title="s__('IncidentSettings|Incident settings')"
+    active
   >
     <gl-form class="gl-pt-3" @submit.prevent="updateServiceLevelAgreementSettings">
       <p class="gl-line-height-20">

ee/spec/frontend/incidents_settings/components/__snapshots__/service_level_agreement_form_spec.js.snap

@@ -2,6 +2,7 @@
 
 exports[`Alert integration settings form should match the default snapshot 1`] = `
 <gl-tab-stub
+  active=""
   title="Incident settings"
   titlelinkclass=""
 >

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

@@ -41,6 +41,8 @@ exports[`IncidentsSettingTabs should render the component 1`] = `
     <gl-tabs-stub
       theme="indigo"
     >
+      <!---->
+       
       <gl-tab-stub
         title="Alert integration"
         titlelinkclass=""
@@ -60,8 +62,6 @@ exports[`IncidentsSettingTabs should render the component 1`] = `
         />
       </gl-tab-stub>
       <!---->
-       
-      <!---->
     </gl-tabs-stub>
   </div>
 </section>