From 651ddf87e7d4eaad02589008a60026ac3430adec Mon Sep 17 00:00:00 2001 From: Kevin Heis Date: Thu, 7 Aug 2025 14:16:31 -0700 Subject: [PATCH 1/2] Changing media type should dynamically change examples (#57029) --- src/rest/components/get-rest-code-samples.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/rest/components/get-rest-code-samples.ts b/src/rest/components/get-rest-code-samples.ts index e952961baf7c..bff5fee3ca8d 100644 --- a/src/rest/components/get-rest-code-samples.ts +++ b/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 } From a1b475c93fa96e34008ea930f5f56769cee39725 Mon Sep 17 00:00:00 2001 From: Devin Dooley Date: Thu, 7 Aug 2025 14:55:58 -0700 Subject: [PATCH 2/2] Stop displaying GHES deprecation banner for supported versions (#57015) --- src/archives/tests/deprecated-enterprise-versions.ts | 6 ++++-- src/versions/components/DeprecationBanner.tsx | 10 ++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/archives/tests/deprecated-enterprise-versions.ts b/src/archives/tests/deprecated-enterprise-versions.ts index 3515fb7bb587..c1274b6e2021 100644 --- a/src/archives/tests/deprecated-enterprise-versions.ts +++ b/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' diff --git a/src/versions/components/DeprecationBanner.tsx b/src/versions/components/DeprecationBanner.tsx index ed989fb15344..f80475fd2be3 100644 --- a/src/versions/components/DeprecationBanner.tsx +++ b/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 (