Merge branch '7255-unable-to-see-system-header-footer-in-admin-dashboard' into 'master'

Resolve "Unable to see system header and footer form with Ultimate license"

Closes #7255

See merge request gitlab-org/gitlab-ee!6926

ee/app/views/admin/appearances/_system_header_footer_form.html.haml

-- return unless License.feature_available?(:system_header_footer_form)
+- return unless License.feature_available?(:system_header_footer)
 
 - form = local_assigns.fetch(:form)
 

ee/changelogs/unreleased/7255-unable-to-see-system-header-footer-in-admin-dashboard.yml

+---
+title: Fixes bug that prevented a user from seeing the system header and footer settings on the admin dashboard
+merge_request: 6926
+author:
+type: fixed

spec/features/admin/admin_appearance_spec.rb

@@ -39,6 +39,31 @@ describe 'Admin Appearance' do
     expect_custom_new_project_appearance(appearance)
   end
 
+  context 'Custom system header and footer' do
+    before do
+      appearance.update(header_message: "Foo", footer_message: "Bar")
+      sign_in(create(:admin))
+    end
+
+    it 'shows custom system header and footer when licensed' do
+      stub_licensed_features(system_header_footer: true)
+
+      visit admin_appearances_path
+
+      expect(page).to have_content appearance.header_message
+      expect(page).to have_content appearance.footer_message
+    end
+
+    it 'does not show custom system header and footer when unlicensed' do
+      stub_licensed_features(system_header_footer: false)
+
+      visit admin_appearances_path
+
+      expect(page).not_to have_content appearance.header_message
+      expect(page).not_to have_content appearance.footer_message
+    end
+  end
+
   it 'Custom sign-in page' do
     visit new_user_session_path