Skip to content

Commit a9d106d

Browse files
authored
Merge pull request #45617 from github/repo-sync
Repo sync
2 parents 3b67a40 + d57cbf7 commit a9d106d

11 files changed

Lines changed: 143 additions & 6 deletions

src/graphql/data/fpt/category-map.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,7 @@
13071307
"pullrequestreviewdecision": "pulls",
13081308
"pullrequestreviewevent": "pulls",
13091309
"pullrequestreviewstate": "pulls",
1310+
"pullrequestreviewthreadresolutionreason": "pulls",
13101311
"pullrequestreviewthreadsubjecttype": "pulls",
13111312
"pullrequeststate": "pulls",
13121313
"pullrequesttimelineitemsitemtype": "pulls",

src/graphql/data/fpt/changelog.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,21 @@
11
[
2+
{
3+
"schemaChanges": [
4+
{
5+
"title": "The GraphQL schema includes these changes:",
6+
"changes": [
7+
"<p>Type <code>PullRequestReviewThreadResolutionReason</code> was added</p>",
8+
"<p>Enum value <code>ADDRESSED</code> was added to enum <code>PullRequestReviewThreadResolutionReason</code></p>",
9+
"<p>Enum value <code>INVALID</code> was added to enum <code>PullRequestReviewThreadResolutionReason</code></p>",
10+
"<p>Enum value 'WONT_FIX<code>was added to enum</code>PullRequestReviewThreadResolutionReason'</p>",
11+
"<p>Input field <code>resolutionReason</code> of type <code>PullRequestReviewThreadResolutionReason</code> was added to input object type <code>ResolveReviewThreadInput</code></p>"
12+
]
13+
}
14+
],
15+
"previewChanges": [],
16+
"upcomingChanges": [],
17+
"date": "2026-08-25"
18+
},
219
{
320
"schemaChanges": [
421
{

src/graphql/data/fpt/schema-issues.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11566,8 +11566,7 @@
1156611566
"description": "<p>The ID of the organization where the issue field will be created.</p>",
1156711567
"type": "ID!",
1156811568
"id": "id",
11569-
"href": "/graphql/reference/other#scalar-id",
11570-
"isDeprecated": false
11569+
"href": "/graphql/reference/other#scalar-id"
1157111570
},
1157211571
{
1157311572
"name": "visibility",

src/graphql/data/fpt/schema-pulls.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8319,6 +8319,28 @@
83198319
],
83208320
"category": "pulls"
83218321
},
8322+
{
8323+
"name": "PullRequestReviewThreadResolutionReason",
8324+
"id": "pullrequestreviewthreadresolutionreason",
8325+
"href": "/graphql/reference/pulls#enum-pullrequestreviewthreadresolutionreason",
8326+
"description": "<p>The possible reasons a pull request review thread was resolved.</p>",
8327+
"isDeprecated": false,
8328+
"values": [
8329+
{
8330+
"name": "ADDRESSED",
8331+
"description": "<p>The review comment was addressed.</p>"
8332+
},
8333+
{
8334+
"name": "INVALID",
8335+
"description": "<p>The review comment is invalid.</p>"
8336+
},
8337+
{
8338+
"name": "WONT_FIX",
8339+
"description": "<p>The review comment will not be addressed.</p>"
8340+
}
8341+
],
8342+
"category": "pulls"
8343+
},
83228344
{
83238345
"name": "PullRequestReviewThreadSubjectType",
83248346
"id": "pullrequestreviewthreadsubjecttype",
@@ -10570,6 +10592,13 @@
1057010592
"id": "string",
1057110593
"href": "/graphql/reference/other#scalar-string"
1057210594
},
10595+
{
10596+
"name": "resolutionReason",
10597+
"description": "<p>The reason a Copilot code review thread was resolved.</p>",
10598+
"type": "PullRequestReviewThreadResolutionReason",
10599+
"id": "pullrequestreviewthreadresolutionreason",
10600+
"href": "/graphql/reference/pulls#enum-pullrequestreviewthreadresolutionreason"
10601+
},
1057310602
{
1057410603
"name": "threadId",
1057510604
"description": "<p>The ID of the thread to resolve.</p>",

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

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8453,7 +8453,7 @@ input CreateIssueFieldInput {
84538453
"""
84548454
The ID of the organization where the issue field will be created.
84558455
"""
8456-
ownerId: ID! @possibleTypes(concreteTypes: ["Organization"])
8456+
ownerId: ID!
84578457

84588458
"""
84598459
The visibility of the issue field.
@@ -46858,6 +46858,26 @@ type PullRequestReviewThreadEdge {
4685846858
node: PullRequestReviewThread
4685946859
}
4686046860

46861+
"""
46862+
The possible reasons a pull request review thread was resolved.
46863+
"""
46864+
enum PullRequestReviewThreadResolutionReason @docsCategory(name: "pulls") {
46865+
"""
46866+
The review comment was addressed.
46867+
"""
46868+
ADDRESSED
46869+
46870+
"""
46871+
The review comment is invalid.
46872+
"""
46873+
INVALID
46874+
46875+
"""
46876+
The review comment will not be addressed.
46877+
"""
46878+
WONT_FIX
46879+
}
46880+
4686146881
"""
4686246882
The possible subject types of a pull request review comment.
4686346883
"""
@@ -59316,6 +59336,11 @@ input ResolveReviewThreadInput {
5931659336
"""
5931759337
clientMutationId: String
5931859338

59339+
"""
59340+
The reason a Copilot code review thread was resolved.
59341+
"""
59342+
resolutionReason: PullRequestReviewThreadResolutionReason
59343+
5931959344
"""
5932059345
The ID of the thread to resolve
5932159346
"""

src/graphql/data/ghec/category-map.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,7 @@
13071307
"pullrequestreviewdecision": "pulls",
13081308
"pullrequestreviewevent": "pulls",
13091309
"pullrequestreviewstate": "pulls",
1310+
"pullrequestreviewthreadresolutionreason": "pulls",
13101311
"pullrequestreviewthreadsubjecttype": "pulls",
13111312
"pullrequeststate": "pulls",
13121313
"pullrequesttimelineitemsitemtype": "pulls",

src/graphql/data/ghec/schema-issues.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11566,8 +11566,7 @@
1156611566
"description": "<p>The ID of the organization where the issue field will be created.</p>",
1156711567
"type": "ID!",
1156811568
"id": "id",
11569-
"href": "/graphql/reference/other#scalar-id",
11570-
"isDeprecated": false
11569+
"href": "/graphql/reference/other#scalar-id"
1157111570
},
1157211571
{
1157311572
"name": "visibility",

src/graphql/data/ghec/schema-pulls.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8319,6 +8319,28 @@
83198319
],
83208320
"category": "pulls"
83218321
},
8322+
{
8323+
"name": "PullRequestReviewThreadResolutionReason",
8324+
"id": "pullrequestreviewthreadresolutionreason",
8325+
"href": "/graphql/reference/pulls#enum-pullrequestreviewthreadresolutionreason",
8326+
"description": "<p>The possible reasons a pull request review thread was resolved.</p>",
8327+
"isDeprecated": false,
8328+
"values": [
8329+
{
8330+
"name": "ADDRESSED",
8331+
"description": "<p>The review comment was addressed.</p>"
8332+
},
8333+
{
8334+
"name": "INVALID",
8335+
"description": "<p>The review comment is invalid.</p>"
8336+
},
8337+
{
8338+
"name": "WONT_FIX",
8339+
"description": "<p>The review comment will not be addressed.</p>"
8340+
}
8341+
],
8342+
"category": "pulls"
8343+
},
83228344
{
83238345
"name": "PullRequestReviewThreadSubjectType",
83248346
"id": "pullrequestreviewthreadsubjecttype",
@@ -10570,6 +10592,13 @@
1057010592
"id": "string",
1057110593
"href": "/graphql/reference/other#scalar-string"
1057210594
},
10595+
{
10596+
"name": "resolutionReason",
10597+
"description": "<p>The reason a Copilot code review thread was resolved.</p>",
10598+
"type": "PullRequestReviewThreadResolutionReason",
10599+
"id": "pullrequestreviewthreadresolutionreason",
10600+
"href": "/graphql/reference/pulls#enum-pullrequestreviewthreadresolutionreason"
10601+
},
1057310602
{
1057410603
"name": "threadId",
1057510604
"description": "<p>The ID of the thread to resolve.</p>",

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

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8453,7 +8453,7 @@ input CreateIssueFieldInput {
84538453
"""
84548454
The ID of the organization where the issue field will be created.
84558455
"""
8456-
ownerId: ID! @possibleTypes(concreteTypes: ["Organization"])
8456+
ownerId: ID!
84578457

84588458
"""
84598459
The visibility of the issue field.
@@ -46858,6 +46858,26 @@ type PullRequestReviewThreadEdge {
4685846858
node: PullRequestReviewThread
4685946859
}
4686046860

46861+
"""
46862+
The possible reasons a pull request review thread was resolved.
46863+
"""
46864+
enum PullRequestReviewThreadResolutionReason @docsCategory(name: "pulls") {
46865+
"""
46866+
The review comment was addressed.
46867+
"""
46868+
ADDRESSED
46869+
46870+
"""
46871+
The review comment is invalid.
46872+
"""
46873+
INVALID
46874+
46875+
"""
46876+
The review comment will not be addressed.
46877+
"""
46878+
WONT_FIX
46879+
}
46880+
4686146881
"""
4686246882
The possible subject types of a pull request review comment.
4686346883
"""
@@ -59316,6 +59336,11 @@ input ResolveReviewThreadInput {
5931659336
"""
5931759337
clientMutationId: String
5931859338

59339+
"""
59340+
The reason a Copilot code review thread was resolved.
59341+
"""
59342+
resolutionReason: PullRequestReviewThreadResolutionReason
59343+
5931959344
"""
5932059345
The ID of the thread to resolve
5932159346
"""

src/languages/lib/correct-translation-content.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -891,6 +891,12 @@ export function correctTranslatedContentStrings(
891891
// `{% 行标题结束 %}` — order swap (rowheaders + end)
892892
content = content.replaceAll('{% 行标题结束 %}', '{% endrowheaders %}')
893893
content = content.replaceAll('{%- 行标题结束 %}', '{%- endrowheaders %}')
894+
// `{% 结束表头列 %}` — "end table header column" = endrowheaders. Found in
895+
// codeql-query-tables reusables (python/rust/java/go/ruby/javascript), where
896+
// the opener `{% rowheaders %}` was correctly left in English but the closer
897+
// was translated, leaving the tag unclosed and breaking table rendering.
898+
content = content.replaceAll('{% 结束表头列 %}', '{% endrowheaders %}')
899+
content = content.replaceAll('{%- 结束表头列 %}', '{%- endrowheaders %}')
894900
// Capitalized `{% Variables.X %}` / `{% Reusables.X %}` — translator title-cased
895901
content = content.replaceAll('{% data Variables.', '{% data variables.')
896902
content = content.replaceAll('{% data Reusables.', '{% data reusables.')

0 commit comments

Comments
 (0)