Merge pull request #39723 from github/repo-sync

Repo sync

Author: docs-bot

src/archives/tests/deprecated-enterprise-versions.ts

@@ -138,7 +138,8 @@ describe('recently deprecated redirects', () => {
 })
 
 describe('deprecation banner', () => {
-  test('renders a deprecation warning banner on oldest supported Enterprise version', async () => {
+  // The deprecation banner is temporarily hidden for supported versions
+  test.skip('renders a deprecation warning banner on oldest supported Enterprise version', async () => {
     const { $ } = await getDOM(`/en/enterprise/${enterpriseServerReleases.oldestSupported}`)
     expect($('[data-testid=deprecation-banner]').length).toBe(1)
   })
@@ -153,7 +154,8 @@ describe('deprecation banner', () => {
     expect($('[data-testid=deprecation-banner] b').text().endsWith('discontinued on .')).toBe(false)
   })
 
-  test('deprecation warning banner includes the right text depending on the date', async () => {
+  // The deprecation banner is temporarily hidden for supported versions
+  test.skip('deprecation warning banner includes the right text depending on the date', async () => {
     const { $ } = await getDOM(`/en/enterprise/${enterpriseServerReleases.oldestSupported}`)
     const expectedString = enterpriseServerReleases.isOldestReleaseDeprecated
       ? 'was discontinued'

src/rest/components/get-rest-code-samples.ts

@@ -498,8 +498,11 @@ function getRequiredQueryParamsPath(operation: Operation, codeSample: CodeSample
 }
 
 function getAcceptHeader(codeSample: CodeSample) {
-  // This allows us to display custom media types like application/sarif+json
-  return codeSample?.response?.contentType?.includes('+json')
-    ? codeSample.response.contentType
-    : 'application/vnd.github+json'
+  const contentType = codeSample?.response?.contentType
+
+  if (!contentType || contentType === 'application/json') {
+    return 'application/vnd.github+json'
+  }
+
+  return contentType
 }

src/versions/components/DeprecationBanner.tsx

@@ -6,6 +6,12 @@ import cx from 'classnames'
 
 import styles from './DeprecationBanner.module.scss'
 
+// GHES deprecation dates are being extended while
+// performance issues are being addressed in versions >= 3.15.
+// This banner should remain hidden for the supported versions (>=3.14) until
+// new deprecation dates are announced.
+const DEPRECATION_BANNER_EXCEPTIONS = ['3.14']
+
 export const DeprecationBanner = () => {
   const { data, enterpriseServerReleases } = useMainContext()
   const { currentVersion } = useVersion()
@@ -23,6 +29,10 @@ export const DeprecationBanner = () => {
     ? enterpriseDeprecation.version_was_deprecated
     : enterpriseDeprecation.version_will_be_deprecated
 
+  if (DEPRECATION_BANNER_EXCEPTIONS.some((version) => currentVersion.includes(version))) {
+    return null
+  }
+
   return (
     <div
       data-testid="deprecation-banner"