Add latest changes from gitlab-org/gitlab@master

17 files changed, 201 insertions, 230 deletions

diff --git a/app/assets/javascripts/boards/components/sidebar/board_sidebar_due_date.vue b/app/assets/javascripts/boards/components/sidebar/board_sidebar_due_date.vue
index 4a664d5beef..373351eca22 100644
--- a/app/assets/javascripts/boards/components/sidebar/board_sidebar_due_date.vue
+++ b/app/assets/javascripts/boards/components/sidebar/board_sidebar_due_date.vue
@@ -88,15 +88,13 @@ export default {
         </gl-button>
       </div>
     </template>
-    <template>
-      <gl-datepicker
-        ref="datePicker"
-        :value="parsedDueDate"
-        show-clear-button
-        @input="setDueDate"
-        @clear="setDueDate(null)"
-      />
-    </template>
+    <gl-datepicker
+      ref="datePicker"
+      :value="parsedDueDate"
+      show-clear-button
+      @input="setDueDate"
+      @clear="setDueDate(null)"
+    />
   </board-editable-item>
 </template>
 <style>
diff --git a/app/assets/javascripts/boards/components/sidebar/board_sidebar_issue_title.vue b/app/assets/javascripts/boards/components/sidebar/board_sidebar_issue_title.vue
index d0e641daf5c..d26d03323fb 100644
--- a/app/assets/javascripts/boards/components/sidebar/board_sidebar_issue_title.vue
+++ b/app/assets/javascripts/boards/components/sidebar/board_sidebar_issue_title.vue
@@ -136,36 +136,34 @@ export default {
     <template #collapsed>
       <span class="gl-text-gray-800">{{ issue.referencePath }}</span>
     </template>
-    <template>
-      <gl-alert v-if="showChangesAlert" variant="warning" class="gl-mb-5" :dismissible="false">
-        {{ $options.i18n.reviewYourChanges }}
-      </gl-alert>
-      <gl-form @submit.prevent="setTitle">
-        <gl-form-group :invalid-feedback="$options.i18n.invalidFeedback" :state="validationState">
-          <gl-form-input
-            v-model="title"
-            v-autofocusonshow
-            :placeholder="$options.i18n.issueTitlePlaceholder"
-            :state="validationState"
-          />
-        </gl-form-group>
+    <gl-alert v-if="showChangesAlert" variant="warning" class="gl-mb-5" :dismissible="false">
+      {{ $options.i18n.reviewYourChanges }}
+    </gl-alert>
+    <gl-form @submit.prevent="setTitle">
+      <gl-form-group :invalid-feedback="$options.i18n.invalidFeedback" :state="validationState">
+        <gl-form-input
+          v-model="title"
+          v-autofocusonshow
+          :placeholder="$options.i18n.issueTitlePlaceholder"
+          :state="validationState"
+        />
+      </gl-form-group>
 
-        <div class="gl-display-flex gl-w-full gl-justify-content-space-between gl-mt-5">
-          <gl-button
-            variant="success"
-            size="small"
-            data-testid="submit-button"
-            :disabled="!title"
-            @click="setTitle"
-          >
-            {{ $options.i18n.submitButton }}
-          </gl-button>
+      <div class="gl-display-flex gl-w-full gl-justify-content-space-between gl-mt-5">
+        <gl-button
+          variant="success"
+          size="small"
+          data-testid="submit-button"
+          :disabled="!title"
+          @click="setTitle"
+        >
+          {{ $options.i18n.submitButton }}
+        </gl-button>
 
-          <gl-button size="small" data-testid="cancel-button" @click="cancel">
-            {{ $options.i18n.cancelButton }}
-          </gl-button>
-        </div>
-      </gl-form>
-    </template>
+        <gl-button size="small" data-testid="cancel-button" @click="cancel">
+          {{ $options.i18n.cancelButton }}
+        </gl-button>
+      </div>
+    </gl-form>
   </board-editable-item>
 </template>
diff --git a/app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue b/app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue
index 144a81f009b..ef7b4a83b47 100644
--- a/app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue
+++ b/app/assets/javascripts/boards/components/sidebar/board_sidebar_milestone_select.vue
@@ -122,40 +122,38 @@ export default {
     <template v-if="hasMilestone" #collapsed>
       <strong class="gl-text-gray-900">{{ activeIssue.milestone.title }}</strong>
     </template>
-    <template>
-      <gl-dropdown
-        ref="dropdown"
-        :text="dropdownText"
-        :header-text="$options.i18n.assignMilestone"
-        block
+    <gl-dropdown
+      ref="dropdown"
+      :text="dropdownText"
+      :header-text="$options.i18n.assignMilestone"
+      block
+    >
+      <gl-search-box-by-type ref="search" v-model.trim="searchTitle" class="gl-m-3" />
+      <gl-dropdown-item
+        data-testid="no-milestone-item"
+        :is-check-item="true"
+        :is-checked="!activeIssue.milestone"
+        @click="setMilestone(null)"
       >
-        <gl-search-box-by-type ref="search" v-model.trim="searchTitle" class="gl-m-3" />
+        {{ $options.i18n.noMilestone }}
+      </gl-dropdown-item>
+      <gl-dropdown-divider />
+      <gl-loading-icon v-if="$apollo.loading" class="gl-py-4" />
+      <template v-else-if="milestones.length > 0">
         <gl-dropdown-item
-          data-testid="no-milestone-item"
+          v-for="milestone in milestones"
+          :key="milestone.id"
           :is-check-item="true"
-          :is-checked="!activeIssue.milestone"
-          @click="setMilestone(null)"
+          :is-checked="activeIssue.milestone && milestone.id === activeIssue.milestone.id"
+          data-testid="milestone-item"
+          @click="setMilestone(milestone.id)"
         >
-          {{ $options.i18n.noMilestone }}
+          {{ milestone.title }}
         </gl-dropdown-item>
-        <gl-dropdown-divider />
-        <gl-loading-icon v-if="$apollo.loading" class="gl-py-4" />
-        <template v-else-if="milestones.length > 0">
-          <gl-dropdown-item
-            v-for="milestone in milestones"
-            :key="milestone.id"
-            :is-check-item="true"
-            :is-checked="activeIssue.milestone && milestone.id === activeIssue.milestone.id"
-            data-testid="milestone-item"
-            @click="setMilestone(milestone.id)"
-          >
-            {{ milestone.title }}
-          </gl-dropdown-item>
-        </template>
-        <gl-dropdown-text v-else data-testid="no-milestones-found">
-          {{ $options.i18n.noMilestonesFound }}
-        </gl-dropdown-text>
-      </gl-dropdown>
-    </template>
+      </template>
+      <gl-dropdown-text v-else data-testid="no-milestones-found">
+        {{ $options.i18n.noMilestonesFound }}
+      </gl-dropdown-text>
+    </gl-dropdown>
   </board-editable-item>
 </template>
diff --git a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue
index c157b04b4f5..c5678173be4 100644
--- a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue
+++ b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue
@@ -131,48 +131,46 @@ export default {
       :title="modalTitle"
       kind="danger"
     >
-      <template>
-        <p>{{ warningMessage }}</p>
-        <div v-if="confirmCleanup">
-          {{ s__('ClusterIntegration|This will permanently delete the following resources:') }}
-          <ul>
-            <li>
-              {{ s__('ClusterIntegration|All installed applications and related resources') }}
-            </li>
-            <li>
-              <gl-sprintf :message="s__('ClusterIntegration|The %{gitlabNamespace} namespace')">
-                <template #gitlabNamespace>
-                  <!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings -->
-                  <code>{{ 'gitlab-managed-apps' }}</code>
-                </template>
-              </gl-sprintf>
-            </li>
-            <li>{{ s__('ClusterIntegration|Any project namespaces') }}</li>
-            <!-- eslint-disable @gitlab/vue-require-i18n-strings -->
-            <li><code>clusterroles</code></li>
-            <li><code>clusterrolebindings</code></li>
-            <!-- eslint-enable @gitlab/vue-require-i18n-strings -->
-          </ul>
-        </div>
-        <strong v-html="confirmationTextLabel"></strong>
-        <form ref="form" :action="clusterPath" method="post" class="gl-mb-5">
-          <input ref="method" type="hidden" name="_method" value="delete" />
-          <input :value="csrfToken" type="hidden" name="authenticity_token" />
-          <input ref="cleanup" type="hidden" name="cleanup" value="true" />
-          <gl-form-input
-            v-model="enteredClusterName"
-            autofocus
-            type="text"
-            name="confirm_cluster_name_input"
-            autocomplete="off"
-          />
-        </form>
-        <span v-if="confirmCleanup">{{
-          s__(
-            'ClusterIntegration|If you do not wish to delete all associated GitLab resources, you can simply remove the integration.',
-          )
-        }}</span>
-      </template>
+      <p>{{ warningMessage }}</p>
+      <div v-if="confirmCleanup">
+        {{ s__('ClusterIntegration|This will permanently delete the following resources:') }}
+        <ul>
+          <li>
+            {{ s__('ClusterIntegration|All installed applications and related resources') }}
+          </li>
+          <li>
+            <gl-sprintf :message="s__('ClusterIntegration|The %{gitlabNamespace} namespace')">
+              <template #gitlabNamespace>
+                <!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings -->
+                <code>{{ 'gitlab-managed-apps' }}</code>
+              </template>
+            </gl-sprintf>
+          </li>
+          <li>{{ s__('ClusterIntegration|Any project namespaces') }}</li>
+          <!-- eslint-disable @gitlab/vue-require-i18n-strings -->
+          <li><code>clusterroles</code></li>
+          <li><code>clusterrolebindings</code></li>
+          <!-- eslint-enable @gitlab/vue-require-i18n-strings -->
+        </ul>
+      </div>
+      <strong v-html="confirmationTextLabel"></strong>
+      <form ref="form" :action="clusterPath" method="post" class="gl-mb-5">
+        <input ref="method" type="hidden" name="_method" value="delete" />
+        <input :value="csrfToken" type="hidden" name="authenticity_token" />
+        <input ref="cleanup" type="hidden" name="cleanup" value="true" />
+        <gl-form-input
+          v-model="enteredClusterName"
+          autofocus
+          type="text"
+          name="confirm_cluster_name_input"
+          autocomplete="off"
+        />
+      </form>
+      <span v-if="confirmCleanup">{{
+        s__(
+          'ClusterIntegration|If you do not wish to delete all associated GitLab resources, you can simply remove the integration.',
+        )
+      }}</span>
       <template #modal-footer>
         <gl-button variant="secondary" @click="handleCancel">{{ s__('Cancel') }}</gl-button>
         <template v-if="confirmCleanup">
diff --git a/app/assets/javascripts/feature_flags/components/feature_flags_tab.vue b/app/assets/javascripts/feature_flags/components/feature_flags_tab.vue
index 24b0b54d1be..d0df00e446b 100644
--- a/app/assets/javascripts/feature_flags/components/feature_flags_tab.vue
+++ b/app/assets/javascripts/feature_flags/components/feature_flags_tab.vue
@@ -68,41 +68,39 @@ export default {
       <span data-testid="feature-flags-tab-title">{{ title }}</span>
       <gl-badge size="sm" class="gl-tab-counter-badge">{{ itemCount }}</gl-badge>
     </template>
-    <template>
-      <gl-alert
-        v-for="(message, index) in alerts"
-        :key="index"
-        data-testid="serverErrors"
-        variant="danger"
-        @dismiss="clearAlert(index)"
-      >
-        {{ message }}
-      </gl-alert>
+    <gl-alert
+      v-for="(message, index) in alerts"
+      :key="index"
+      data-testid="serverErrors"
+      variant="danger"
+      @dismiss="clearAlert(index)"
+    >
+      {{ message }}
+    </gl-alert>
 
-      <gl-loading-icon v-if="isLoading" :label="loadingLabel" size="md" class="gl-mt-4" />
+    <gl-loading-icon v-if="isLoading" :label="loadingLabel" size="md" class="gl-mt-4" />
 
-      <gl-empty-state
-        v-else-if="errorState"
-        :title="errorTitle"
-        :description="s__(`FeatureFlags|Try again in a few moments or contact your support team.`)"
-        :svg-path="errorStateSvgPath"
-        data-testid="error-state"
-      />
+    <gl-empty-state
+      v-else-if="errorState"
+      :title="errorTitle"
+      :description="s__(`FeatureFlags|Try again in a few moments or contact your support team.`)"
+      :svg-path="errorStateSvgPath"
+      data-testid="error-state"
+    />
 
-      <gl-empty-state
-        v-else-if="emptyState"
-        :title="emptyTitle"
-        :svg-path="errorStateSvgPath"
-        data-testid="empty-state"
-      >
-        <template #description>
-          {{ emptyDescription }}
-          <gl-link :href="featureFlagsHelpPagePath" target="_blank">
-            {{ s__('FeatureFlags|More information') }}
-          </gl-link>
-        </template>
-      </gl-empty-state>
-      <slot> </slot>
-    </template>
+    <gl-empty-state
+      v-else-if="emptyState"
+      :title="emptyTitle"
+      :svg-path="errorStateSvgPath"
+      data-testid="empty-state"
+    >
+      <template #description>
+        {{ emptyDescription }}
+        <gl-link :href="featureFlagsHelpPagePath" target="_blank">
+          {{ s__('FeatureFlags|More information') }}
+        </gl-link>
+      </template>
+    </gl-empty-state>
+    <slot> </slot>
   </gl-tab>
 </template>
diff --git a/app/assets/javascripts/grafana_integration/components/grafana_integration.vue b/app/assets/javascripts/grafana_integration/components/grafana_integration.vue
index 7a991ac2455..7b029c6cf54 100644
--- a/app/assets/javascripts/grafana_integration/components/grafana_integration.vue
+++ b/app/assets/javascripts/grafana_integration/components/grafana_integration.vue
@@ -54,9 +54,9 @@ export default {
 <template>
   <section id="grafana" class="settings no-animate js-grafana-integration">
     <div class="settings-header">
-      <h3 class="js-section-header h4">
+      <h4 class="js-section-header">
         {{ s__('GrafanaIntegration|Grafana authentication') }}
-      </h3>
+      </h4>
       <gl-button class="js-settings-toggle">{{ __('Expand') }}</gl-button>
       <p class="js-section-sub-header">
         {{ s__('GrafanaIntegration|Embed Grafana charts in GitLab issues.') }}
diff --git a/app/assets/javascripts/incidents_settings/components/incidents_settings_tabs.vue b/app/assets/javascripts/incidents_settings/components/incidents_settings_tabs.vue
index c90ff8079b8..85ce6fb801a 100644
--- a/app/assets/javascripts/incidents_settings/components/incidents_settings_tabs.vue
+++ b/app/assets/javascripts/incidents_settings/components/incidents_settings_tabs.vue
@@ -26,7 +26,7 @@ export default {
     class="settings no-animate qa-incident-management-settings"
   >
     <div class="settings-header">
-      <h4 ref="sectionHeader" class="gl-my-3! gl-py-1">
+      <h4 ref="sectionHeader">
         {{ $options.i18n.headerText }}
       </h4>
       <gl-button ref="toggleBtn" class="js-settings-toggle">{{
diff --git a/app/assets/javascripts/jobs/components/environments_block.vue b/app/assets/javascripts/jobs/components/environments_block.vue
index ec7868d9235..c78d36355e2 100644
--- a/app/assets/javascripts/jobs/components/environments_block.vue
+++ b/app/assets/javascripts/jobs/components/environments_block.vue
@@ -201,9 +201,7 @@ export default {
             />
             <template v-else>{{ clusterNameOrLink.name }}</template>
           </template>
-          <template #kubernetesNamespace>
-            <template>{{ kubernetesNamespace }}</template>
-          </template>
+          <template #kubernetesNamespace>{{ kubernetesNamespace }}</template>
           <template #deploymentLink>
             <gl-link
               :href="deploymentLink.path"
diff --git a/app/assets/javascripts/operation_settings/components/metrics_settings.vue b/app/assets/javascripts/operation_settings/components/metrics_settings.vue
index 2e972dd7154..2d2e625d3d3 100644
--- a/app/assets/javascripts/operation_settings/components/metrics_settings.vue
+++ b/app/assets/javascripts/operation_settings/components/metrics_settings.vue
@@ -31,9 +31,9 @@ export default {
 <template>
   <section class="settings no-animate">
     <div class="settings-header">
-      <h3 class="js-section-header h4">
+      <h4 class="js-section-header">
         {{ s__('MetricsSettings|Metrics dashboard') }}
-      </h3>
+      </h4>
       <gl-button class="js-settings-toggle">{{ __('Expand') }}</gl-button>
       <p class="js-section-sub-header">
         {{ s__('MetricsSettings|Manage Metrics Dashboard settings.') }}
diff --git a/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue b/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
index 9c303cc6445..d2b83f980d7 100644
--- a/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
+++ b/app/assets/javascripts/pages/admin/users/components/delete_user_modal.vue
@@ -85,38 +85,36 @@ export default {
 
 <template>
   <gl-modal ref="modal" modal-id="delete-user-modal" :title="modalTitle" kind="danger">
-    <template>
-      <p>
-        <gl-sprintf :message="content">
-          <template #username>
-            <strong>{{ username }}</strong>
-          </template>
-          <template #strong="props">
-            <strong>{{ props.content }}</strong>
-          </template>
-        </gl-sprintf>
-      </p>
+    <p>
+      <gl-sprintf :message="content">
+        <template #username>
+          <strong>{{ username }}</strong>
+        </template>
+        <template #strong="props">
+          <strong>{{ props.content }}</strong>
+        </template>
+      </gl-sprintf>
+    </p>
 
-      <p>
-        <gl-sprintf :message="s__('AdminUsers|To confirm, type %{username}')">
-          <template #username>
-            <code>{{ username }}</code>
-          </template>
-        </gl-sprintf>
-      </p>
+    <p>
+      <gl-sprintf :message="s__('AdminUsers|To confirm, type %{username}')">
+        <template #username>
+          <code>{{ username }}</code>
+        </template>
+      </gl-sprintf>
+    </p>
 
-      <form ref="form" :action="deleteUserUrl" method="post" @submit.prevent>
-        <input ref="method" type="hidden" name="_method" value="delete" />
-        <input :value="csrfToken" type="hidden" name="authenticity_token" />
-        <gl-form-input
-          v-model="enteredUsername"
-          autofocus
-          type="text"
-          name="username"
-          autocomplete="off"
-        />
-      </form>
-    </template>
+    <form ref="form" :action="deleteUserUrl" method="post" @submit.prevent>
+      <input ref="method" type="hidden" name="_method" value="delete" />
+      <input :value="csrfToken" type="hidden" name="authenticity_token" />
+      <gl-form-input
+        v-model="enteredUsername"
+        autofocus
+        type="text"
+        name="username"
+        autocomplete="off"
+      />
+    </form>
     <template #modal-footer>
       <gl-button @click="onCancel">{{ s__('Cancel') }}</gl-button>
       <gl-button
diff --git a/app/assets/javascripts/pipelines/components/graph_shared/drawing_utils.js b/app/assets/javascripts/pipelines/components/graph_shared/drawing_utils.js
index 65c215be794..202498fb188 100644
--- a/app/assets/javascripts/pipelines/components/graph_shared/drawing_utils.js
+++ b/app/assets/javascripts/pipelines/components/graph_shared/drawing_utils.js
@@ -40,10 +40,10 @@ export const generateLinksData = ({ links }, containerID, modifier = '') => {
     // positioned in the center of the job node by adding half the height
     // of the job pill.
     const paddingLeft = parseFloat(
-      window.getComputedStyle(containerEl, null).getPropertyValue('padding-left'),
+      window.getComputedStyle(containerEl, null).getPropertyValue('padding-left') || 0,
     );
     const paddingTop = parseFloat(
-      window.getComputedStyle(containerEl, null).getPropertyValue('padding-top'),
+      window.getComputedStyle(containerEl, null).getPropertyValue('padding-top') || 0,
     );
 
     const sourceNodeX = sourceNodeCoordinates.right - containerCoordinates.x - paddingLeft;
diff --git a/app/assets/javascripts/pipelines/components/graph_shared/links_inner.vue b/app/assets/javascripts/pipelines/components/graph_shared/links_inner.vue
index 89444076ae0..f0119884b76 100644
--- a/app/assets/javascripts/pipelines/components/graph_shared/links_inner.vue
+++ b/app/assets/javascripts/pipelines/components/graph_shared/links_inner.vue
@@ -123,17 +123,15 @@ export default {
       :width="`${containerMeasurements.width}px`"
       :height="`${containerMeasurements.height}px`"
     >
-      <template>
-        <path
-          v-for="link in links"
-          :key="link.path"
-          :ref="link.ref"
-          :d="link.path"
-          class="gl-fill-transparent gl-transition-duration-slow gl-transition-timing-function-ease"
-          :class="getLinkClasses(link)"
-          :stroke-width="$options.STROKE_WIDTH"
-        />
-      </template>
+      <path
+        v-for="link in links"
+        :key="link.path"
+        :ref="link.ref"
+        :d="link.path"
+        class="gl-fill-transparent gl-transition-duration-slow gl-transition-timing-function-ease"
+        :class="getLinkClasses(link)"
+        :stroke-width="$options.STROKE_WIDTH"
+      />
     </svg>
     <slot></slot>
   </div>
diff --git a/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue b/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue
index 8636808b69e..8f58de004b2 100644
--- a/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue
+++ b/app/assets/javascripts/pipelines/components/pipeline_graph/pipeline_graph.vue
@@ -224,17 +224,15 @@ export default {
       data-testid="graph-container"
     >
       <svg :viewBox="viewBox" :width="width" :height="height" class="gl-absolute">
-        <template>
-          <path
-            v-for="link in links"
-            :key="link.path"
-            :ref="link.ref"
-            :d="link.path"
-            class="gl-fill-transparent gl-transition-duration-slow gl-transition-timing-function-ease"
-            :class="getLinkClasses(link)"
-            :stroke-width="$options.STROKE_WIDTH"
-          />
-        </template>
+        <path
+          v-for="link in links"
+          :key="link.path"
+          :ref="link.ref"
+          :d="link.path"
+          class="gl-fill-transparent gl-transition-duration-slow gl-transition-timing-function-ease"
+          :class="getLinkClasses(link)"
+          :stroke-width="$options.STROKE_WIDTH"
+        />
       </svg>
       <div
         v-for="(stage, index) in pipelineStages"
diff --git a/app/assets/javascripts/serverless/components/functions.vue b/app/assets/javascripts/serverless/components/functions.vue
index d662cc7b802..e991b963df0 100644
--- a/app/assets/javascripts/serverless/components/functions.vue
+++ b/app/assets/javascripts/serverless/components/functions.vue
@@ -69,18 +69,16 @@ export default {
 
     <div v-else-if="isInstalled">
       <div v-if="hasFunctionData">
-        <template>
-          <div class="groups-list-tree-container js-functions-wrapper">
-            <ul class="content-list group-list-tree">
-              <environment-row
-                v-for="(env, index) in getFunctions"
-                :key="index"
-                :env="env"
-                :env-name="index"
-              />
-            </ul>
-          </div>
-        </template>
+        <div class="groups-list-tree-container js-functions-wrapper">
+          <ul class="content-list group-list-tree">
+            <environment-row
+              v-for="(env, index) in getFunctions"
+              :key="index"
+              :env="env"
+              :env-name="index"
+            />
+          </ul>
+        </div>
         <gl-loading-icon v-if="isLoading" size="lg" class="gl-mt-3 gl-mb-3 js-functions-loader" />
       </div>
       <div v-else class="empty-state js-empty-state">
diff --git a/app/assets/javascripts/static_site_editor/components/edit_drawer.vue b/app/assets/javascripts/static_site_editor/components/edit_drawer.vue
index 0484d38dde0..0685dfdb1d1 100644
--- a/app/assets/javascripts/static_site_editor/components/edit_drawer.vue
+++ b/app/assets/javascripts/static_site_editor/components/edit_drawer.vue
@@ -22,11 +22,6 @@ export default {
 <template>
   <gl-drawer class="gl-pt-8" :open="isOpen" @close="$emit('close')">
     <template #header>{{ __('Page settings') }}</template>
-    <template>
-      <front-matter-controls
-        :settings="settings"
-        @updateSettings="$emit('updateSettings', $event)"
-      />
-    </template>
+    <front-matter-controls :settings="settings" @updateSettings="$emit('updateSettings', $event)" />
   </gl-drawer>
 </template>
diff --git a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue
index 7e82d8f3f9c..eb8400e81c7 100644
--- a/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue
+++ b/app/assets/javascripts/vue_shared/components/dropdown/dropdown_button.vue
@@ -36,10 +36,8 @@ export default {
     aria-expanded="false"
   >
     <gl-loading-icon v-show="isLoading" :inline="true" />
-    <template>
-      <slot v-if="$slots.default"></slot>
-      <span v-else class="dropdown-toggle-text"> {{ toggleText }} </span>
-    </template>
+    <slot v-if="$slots.default"></slot>
+    <span v-else class="dropdown-toggle-text"> {{ toggleText }} </span>
     <gl-icon
       v-show="!isLoading"
       class="gl-absolute gl-top-3 gl-right-3 gl-text-gray-500"
diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
index 15c5b9d6733..387b100a04f 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
@@ -60,9 +60,7 @@ export default {
     </div>
     <span v-if="canAttachFile" class="uploading-container">
       <span class="uploading-progress-container hide">
-        <template>
-          <gl-icon name="media" />
-        </template>
+        <gl-icon name="media" />
         <span class="attaching-file-message"></span>
         <!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings -->
         <span class="uploading-progress">0%</span>