Skip to content

Commit 120cf2d

Browse files
authored
Merge pull request #32293 from github/repo-sync
Repo sync
2 parents 67cd3fe + c471edc commit 120cf2d

File tree

4 files changed

+32
-3
lines changed

4 files changed

+32
-3
lines changed

.github/workflows/sync-search-elasticsearch.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@ jobs:
5858
if (context.payload.workflow_run.conclusion === "success") {
5959
return ["en"]
6060
}
61-
throw new Error(`It was a workflow_run but not success ('${context.payload.workflow_run.conclusion}')`)
61+
console.warn(`NOTE! It was a workflow_run but not success ('${context.payload.workflow_run.conclusion}')`)
62+
console.warn("This means we're not going to index anything in the next dependent step.")
63+
return []
6264
}
6365
6466
if (context.eventName === "workflow_dispatch") {
@@ -95,7 +97,7 @@ jobs:
9597
updateElasticsearchIndexes:
9698
needs: figureOutMatrix
9799
name: Update indexes
98-
if: ${{ github.repository == 'github/docs-internal' }}
100+
if: ${{ github.repository == 'github/docs-internal' && needs.figureOutMatrix.outputs.matrix != '[]' }}
99101
runs-on: ubuntu-20.04-xl
100102
strategy:
101103
fail-fast: false

src/audit-logs/data/ghec/enterprise.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4188,6 +4188,27 @@
41884188
"operation_type"
41894189
]
41904190
},
4191+
{
4192+
"action": "enterprise_team.rename",
4193+
"description": "The name of an enterprise team was changed.",
4194+
"docs_reference_links": "N/A",
4195+
"fields": [
4196+
"actor",
4197+
"actor_id",
4198+
"user_agent",
4199+
"name",
4200+
"business_id",
4201+
"enterprise_team_id",
4202+
"enterprise_team",
4203+
"business",
4204+
"action",
4205+
"_document_id",
4206+
"@timestamp",
4207+
"created_at",
4208+
"operation_type",
4209+
"actor_is_bot"
4210+
]
4211+
},
41914212
{
41924213
"action": "environment.add_protection_rule",
41934214
"description": "A GitHub Actions deployment protection rule was created via the API.",

src/audit-logs/lib/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"apiOnlyEventsAdditionalDescription": "This event is not available in the web interface, only via the REST API, audit log streaming, or JSON/CSV exports.",
3-
"sha": "b7f3cefa0d79e9221a76073e9f6b99d682a83431"
3+
"sha": "86e8c1638b4820a64a1e66501abd9e824b449b3e"
44
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ export function correctTranslatedContentStrings(content, englishContent, context
6161
// Low-hanging fruit for the data tag
6262
content = content.replaceAll('{% データ variables', '{% data variables')
6363
content = content.replaceAll('{% データvariables', '{% data variables')
64+
65+
// Internal issue #4160
66+
content = content.replaceAll(
67+
'- % data variables.product.prodname_copilot_enterprise %}',
68+
'- {% data variables.product.prodname_copilot_enterprise %}',
69+
)
6470
}
6571

6672
if (context.code === 'zh') {

0 commit comments

Comments
 (0)