Skip to content

Commit a4a065e

Browse files
authored
Merge pull request #40249 from github/repo-sync
Repo sync
2 parents b56fb5b + 0df7c29 commit a4a065e

File tree

10 files changed

+64
-58
lines changed

10 files changed

+64
-58
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ describe('recently deprecated redirects', () => {
138138
})
139139

140140
describe('deprecation banner', () => {
141-
// The deprecation banner is temporarily hidden for supported versions
142-
test.skip('renders a deprecation warning banner on oldest supported Enterprise version', async () => {
141+
test('renders a deprecation warning banner on oldest supported Enterprise version', async () => {
143142
const { $ } = await getDOM(`/en/enterprise/${enterpriseServerReleases.oldestSupported}`)
144143
expect($('[data-testid=deprecation-banner]').length).toBe(1)
145144
})
@@ -154,8 +153,7 @@ describe('deprecation banner', () => {
154153
expect($('[data-testid=deprecation-banner] b').text().endsWith('discontinued on .')).toBe(false)
155154
})
156155

157-
// The deprecation banner is temporarily hidden for supported versions
158-
test.skip('deprecation warning banner includes the right text depending on the date', async () => {
156+
test('deprecation warning banner includes the right text depending on the date', async () => {
159157
const { $ } = await getDOM(`/en/enterprise/${enterpriseServerReleases.oldestSupported}`)
160158
const expectedString = enterpriseServerReleases.isOldestReleaseDeprecated
161159
? 'was discontinued'

src/ghes-releases/lib/enterprise-dates.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,31 +229,31 @@
229229
},
230230
"3.14": {
231231
"releaseDate": "2024-08-06",
232-
"deprecationDate": "2025-08-27",
232+
"deprecationDate": "2026-03-17",
233233
"releaseCandidateDate": "2024-08-06",
234234
"generalAvailabilityDate": "2024-08-27"
235235
},
236236
"3.15": {
237237
"releaseDate": "2024-11-12",
238-
"deprecationDate": "2025-12-19",
238+
"deprecationDate": "2026-03-17",
239239
"releaseCandidateDate": "2024-11-12",
240240
"generalAvailabilityDate": "2024-12-03"
241241
},
242242
"3.16": {
243243
"releaseDate": "2025-02-25",
244-
"deprecationDate": "2026-03-11",
244+
"deprecationDate": "2026-06-02",
245245
"releaseCandidateDate": "2025-02-25",
246246
"generalAvailabilityDate": "2025-03-11"
247247
},
248248
"3.17": {
249249
"releaseDate": "2025-05-13",
250-
"deprecationDate": "2026-06-03",
250+
"deprecationDate": "2026-08-25",
251251
"releaseCandidateDate": "2025-05-13",
252252
"generalAvailabilityDate": "2025-06-03"
253253
},
254254
"3.18": {
255255
"releaseDate": "2025-08-05",
256-
"deprecationDate": "2026-08-26",
256+
"deprecationDate": "2026-08-25",
257257
"releaseCandidateDate": "2025-08-05",
258258
"generalAvailabilityDate": "2025-08-26"
259259
},
@@ -287,4 +287,4 @@
287287
"releaseCandidateDate": "2026-11-10",
288288
"generalAvailabilityDate": "2026-12-08"
289289
}
290-
}
290+
}

src/graphql/data/fpt/changelog.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
11
[
2+
{
3+
"schemaChanges": [
4+
{
5+
"title": "The GraphQL schema includes these changes:",
6+
"changes": []
7+
}
8+
],
9+
"previewChanges": [],
10+
"upcomingChanges": [
11+
{
12+
"title": "The following changes will be made to the schema:",
13+
"changes": [
14+
"<p>On member <code>SearchType.ISSUE_ADVANCED</code>:<code>ISSUE_ADVANCED</code> will be removed. <strong>Effective 2025-11-04</strong>.</p>"
15+
]
16+
}
17+
],
18+
"date": "2025-09-05"
19+
},
220
{
321
"schemaChanges": [
422
{

src/graphql/data/fpt/graphql_upcoming_changes.public.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,14 +1504,6 @@ upcoming_changes:
15041504
date: '2025-04-01T00:00:00+00:00'
15051505
criticality: breaking
15061506
owner: github/memex
1507-
- location: SearchType.ISSUE_ADVANCED
1508-
description: '`ISSUE_ADVANCED` will be removed.'
1509-
reason:
1510-
Search for issues and pull requests will be overridden by advanced search
1511-
on September 4, 2025. You can read more about this change on https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/.
1512-
date: '2025-09-04'
1513-
criticality: breaking
1514-
owner: github/issues_advanced_search
15151507
- location: Issue.stateReason.enableDuplicate
15161508
description: '`enableDuplicate` will be removed.'
15171509
reason: The state reason for duplicate issue is now returned by default.
@@ -1526,6 +1518,14 @@ upcoming_changes:
15261518
date: '2025-10-01T00:00:00+00:00'
15271519
criticality: breaking
15281520
owner: github/advisory-database
1521+
- location: SearchType.ISSUE_ADVANCED
1522+
description: '`ISSUE_ADVANCED` will be removed.'
1523+
reason:
1524+
Search for issues and pull requests will be overridden by advanced search
1525+
on November 4, 2025. You can read more about this change on https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/.
1526+
date: '2025-11-04'
1527+
criticality: breaking
1528+
owner: github/issues_advanced_search
15291529
- location: NotificationThread.list
15301530
description: '`list` will be removed. Use the `optionalList` field instead.'
15311531
reason: Null values are possible for this field.

src/graphql/data/fpt/schema.docs.graphql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55192,7 +55192,7 @@ enum SearchType {
5519255192
"""
5519355193
ISSUE_ADVANCED
5519455194
@deprecated(
55195-
reason: "Search for issues and pull requests will be overridden by advanced search on September 4, 2025. You can read more about this change on https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/. Removal on 2025-09-04 UTC."
55195+
reason: "Search for issues and pull requests will be overridden by advanced search on November 4, 2025. You can read more about this change on https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/. Removal on 2025-11-04 UTC."
5519655196
)
5519755197

5519855198
"""

src/graphql/data/fpt/upcoming-changes.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8891,6 +8891,16 @@
88918891
"owner": "github/notifications"
88928892
}
88938893
],
8894+
"2025-11-04": [
8895+
{
8896+
"location": "SearchType.ISSUE_ADVANCED",
8897+
"description": "<p><code>ISSUE_ADVANCED</code> will be removed.</p>",
8898+
"reason": "<p>Search for issues and pull requests will be overridden by advanced search on November 4, 2025. You can read more about this change on <a href=\"https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/\">https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/</a>.</p>",
8899+
"date": "2025-11-04",
8900+
"criticality": "breaking",
8901+
"owner": "github/issues_advanced_search"
8902+
}
8903+
],
88948904
"2025-10-01": [
88958905
{
88968906
"location": "SecurityAdvisory.cvss",
@@ -8909,16 +8919,6 @@
89098919
"owner": "issues"
89108920
}
89118921
],
8912-
"2025-09-04": [
8913-
{
8914-
"location": "SearchType.ISSUE_ADVANCED",
8915-
"description": "<p><code>ISSUE_ADVANCED</code> will be removed.</p>",
8916-
"reason": "<p>Search for issues and pull requests will be overridden by advanced search on September 4, 2025. You can read more about this change on <a href=\"https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/\">https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/</a>.</p>",
8917-
"date": "2025-09-04",
8918-
"criticality": "breaking",
8919-
"owner": "github/issues_advanced_search"
8920-
}
8921-
],
89228922
"2025-04-01": [
89238923
{
89248924
"location": "User.viewerCanCreateProjects",

src/graphql/data/ghec/graphql_upcoming_changes.public.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,14 +1504,6 @@ upcoming_changes:
15041504
date: '2025-04-01T00:00:00+00:00'
15051505
criticality: breaking
15061506
owner: github/memex
1507-
- location: SearchType.ISSUE_ADVANCED
1508-
description: '`ISSUE_ADVANCED` will be removed.'
1509-
reason:
1510-
Search for issues and pull requests will be overridden by advanced search
1511-
on September 4, 2025. You can read more about this change on https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/.
1512-
date: '2025-09-04'
1513-
criticality: breaking
1514-
owner: github/issues_advanced_search
15151507
- location: Issue.stateReason.enableDuplicate
15161508
description: '`enableDuplicate` will be removed.'
15171509
reason: The state reason for duplicate issue is now returned by default.
@@ -1526,6 +1518,14 @@ upcoming_changes:
15261518
date: '2025-10-01T00:00:00+00:00'
15271519
criticality: breaking
15281520
owner: github/advisory-database
1521+
- location: SearchType.ISSUE_ADVANCED
1522+
description: '`ISSUE_ADVANCED` will be removed.'
1523+
reason:
1524+
Search for issues and pull requests will be overridden by advanced search
1525+
on November 4, 2025. You can read more about this change on https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/.
1526+
date: '2025-11-04'
1527+
criticality: breaking
1528+
owner: github/issues_advanced_search
15291529
- location: NotificationThread.list
15301530
description: '`list` will be removed. Use the `optionalList` field instead.'
15311531
reason: Null values are possible for this field.

src/graphql/data/ghec/schema.docs.graphql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55192,7 +55192,7 @@ enum SearchType {
5519255192
"""
5519355193
ISSUE_ADVANCED
5519455194
@deprecated(
55195-
reason: "Search for issues and pull requests will be overridden by advanced search on September 4, 2025. You can read more about this change on https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/. Removal on 2025-09-04 UTC."
55195+
reason: "Search for issues and pull requests will be overridden by advanced search on November 4, 2025. You can read more about this change on https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/. Removal on 2025-11-04 UTC."
5519655196
)
5519755197

5519855198
"""

src/graphql/data/ghec/upcoming-changes.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8891,6 +8891,16 @@
88918891
"owner": "github/notifications"
88928892
}
88938893
],
8894+
"2025-11-04": [
8895+
{
8896+
"location": "SearchType.ISSUE_ADVANCED",
8897+
"description": "<p><code>ISSUE_ADVANCED</code> will be removed.</p>",
8898+
"reason": "<p>Search for issues and pull requests will be overridden by advanced search on November 4, 2025. You can read more about this change on <a href=\"https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/\">https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/</a>.</p>",
8899+
"date": "2025-11-04",
8900+
"criticality": "breaking",
8901+
"owner": "github/issues_advanced_search"
8902+
}
8903+
],
88948904
"2025-10-01": [
88958905
{
88968906
"location": "SecurityAdvisory.cvss",
@@ -8909,16 +8919,6 @@
89098919
"owner": "issues"
89108920
}
89118921
],
8912-
"2025-09-04": [
8913-
{
8914-
"location": "SearchType.ISSUE_ADVANCED",
8915-
"description": "<p><code>ISSUE_ADVANCED</code> will be removed.</p>",
8916-
"reason": "<p>Search for issues and pull requests will be overridden by advanced search on September 4, 2025. You can read more about this change on <a href=\"https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/\">https://github.blog/changelog/2025-03-06-github-issues-projects-api-support-for-issues-advanced-search-and-more/</a>.</p>",
8917-
"date": "2025-09-04",
8918-
"criticality": "breaking",
8919-
"owner": "github/issues_advanced_search"
8920-
}
8921-
],
89228922
"2025-04-01": [
89238923
{
89248924
"location": "User.viewerCanCreateProjects",

src/versions/components/DeprecationBanner.tsx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ import cx from 'classnames'
66

77
import styles from './DeprecationBanner.module.scss'
88

9-
// GHES deprecation dates are being extended while
10-
// performance issues are being addressed in versions >= 3.15.
11-
// This banner should remain hidden for the supported versions (>=3.14) until
12-
// new deprecation dates are announced.
13-
const DEPRECATION_BANNER_EXCEPTIONS = ['3.14']
14-
159
export const DeprecationBanner = () => {
1610
const { data, enterpriseServerReleases } = useMainContext()
1711
const { currentVersion } = useVersion()
@@ -29,10 +23,6 @@ export const DeprecationBanner = () => {
2923
? enterpriseDeprecation.version_was_deprecated
3024
: enterpriseDeprecation.version_will_be_deprecated
3125

32-
if (DEPRECATION_BANNER_EXCEPTIONS.some((version) => currentVersion.includes(version))) {
33-
return null
34-
}
35-
3626
return (
3727
<div
3828
data-testid="deprecation-banner"

0 commit comments

Comments
 (0)