Merge branch '9231-remove-page-heading-in-feature-flags-empty-state' into 'master'

Remove heading from Feature Flags section

Closes #9231

See merge request gitlab-org/gitlab!37613

ee/app/assets/javascripts/feature_flags/components/feature_flags.vue

@@ -132,10 +132,6 @@ export default {
     currentlyDisplayedData() {
       return this.dataForScope(this.scope);
     },
-    shouldRenderTabs() {
-      /* Do not show tabs until after the first request to get the count */
-      return this.count[this.scope] !== undefined;
-    },
     shouldRenderPagination() {
       return (
         !this.isLoading &&
@@ -257,9 +253,9 @@ export default {
       modal-id="configure-feature-flags"
       @token="rotateInstanceId()"
     />
-    <h3 class="page-title with-button">
-      {{ s__('FeatureFlags|Feature Flags') }}
-      <div class="pull-right">
+    <div class="top-area">
+      <navigation-tabs :tabs="tabs" scope="featureflags" @onChangeTab="onChangeTab" />
+      <div class="nav-controls">
         <gl-button
           v-if="canUserConfigure"
           v-gl-modal="'configure-feature-flags'"
@@ -280,7 +276,7 @@ export default {
           {{ s__('FeatureFlags|New feature flag') }}
         </gl-button>
       </div>
-    </h3>
+    </div>
     <gl-alert v-if="!isUserListAlertDismissed" @dismiss="isUserListAlertDismissed = true">
       <gl-sprintf
         :message="
@@ -305,10 +301,6 @@ export default {
       {{ message }}
     </gl-alert>
 
-    <div v-if="shouldRenderTabs" class="top-area scrolling-tabs-container inner-page-scroll-tabs">
-      <navigation-tabs :tabs="tabs" scope="featureflags" @onChangeTab="onChangeTab" />
-    </div>
-
     <gl-loading-icon
       v-if="isLoading"
       :label="s__('FeatureFlags|Loading feature flags')"

ee/changelogs/unreleased/9231-remove-page-heading-in-feature-flags-empty-state.yml

+---
+title: Remove heading from Feature Flags section
+merge_request: 37613
+author:
+type: changed

ee/spec/support/helpers/feature_flag_helpers.rb

@@ -81,7 +81,6 @@ module FeatureFlagHelpers
   end
 
   def expect_user_to_see_feature_flags_index_page
-    expect(page).to have_css('h3.page-title', text: 'Feature Flags')
     expect(page).to have_text('Feature Flags')
     expect(page).to have_text('Lists')
   end