Skip to content

Commit e2f952a

Browse files
docs-botdocs-bot
authored
Merge pull request #37642 from github/repo-sync
Repo sync
2 parents 3de34c4 + 4f07ccd commit e2f952a

File tree

20 files changed

+1576
-76
lines changed

20 files changed

+1576
-76
lines changed

‎content/rest/secret-scanning/alert-dismissal-requests.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
title: Alert dismissal requests
3+
shortTitle: Alert dismissal requests
4+
intro: Use the REST API to manage alert dismissal requests for secret scanning.
5+
versions: # DO NOT MANUALLY EDIT. CHANGES WILL BE OVERWRITTEN BY A 🤖
6+
ghec: '*'
7+
topics:
8+
- API
9+
autogenerated: rest
10+
allowTitleToDifferFromFilename: true
11+
---
12+
13+
<!-- Content after this section is automatically generated -->

‎content/rest/secret-scanning/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ versions:
1010
topics:
1111
- API
1212
children:
13+
- /alert-dismissal-requests
1314
- /delegated-bypass
1415
- /secret-scanning
1516
autogenerated: rest

‎src/github-apps/data/ghec-2022-11-28/fine-grained-pat-permissions.json

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5460,6 +5460,33 @@
54605460
"additional-permissions": false,
54615461
"access": "write"
54625462
},
5463+
{
5464+
"category": "secret-scanning",
5465+
"slug": "list-alert-dismissal-requests-for-secret-scanning-for-a-repository",
5466+
"subcategory": "alert-dismissal-requests",
5467+
"verb": "get",
5468+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning",
5469+
"additional-permissions": true,
5470+
"access": "read"
5471+
},
5472+
{
5473+
"category": "secret-scanning",
5474+
"slug": "get-an-alert-dismissal-request-for-secret-scanning",
5475+
"subcategory": "alert-dismissal-requests",
5476+
"verb": "get",
5477+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning/{alert_number}",
5478+
"additional-permissions": true,
5479+
"access": "read"
5480+
},
5481+
{
5482+
"category": "secret-scanning",
5483+
"slug": "review-an-alert-dismissal-request-for-secret-scanning",
5484+
"subcategory": "alert-dismissal-requests",
5485+
"verb": "patch",
5486+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning/{alert_number}",
5487+
"additional-permissions": true,
5488+
"access": "read"
5489+
},
54635490
{
54645491
"category": "repos",
54655492
"slug": "create-a-repository-dispatch-event",
@@ -8007,6 +8034,15 @@
80078034
"additional-permissions": false,
80088035
"access": "read"
80098036
},
8037+
{
8038+
"category": "secret-scanning",
8039+
"slug": "list-alert-dismissal-requests-for-secret-scanning-for-an-org",
8040+
"subcategory": "alert-dismissal-requests",
8041+
"verb": "get",
8042+
"requestPath": "/orgs/{org}/dismissal-requests/secret-scanning",
8043+
"additional-permissions": false,
8044+
"access": "read"
8045+
},
80108046
{
80118047
"category": "secret-scanning",
80128048
"slug": "list-secret-scanning-alerts-for-an-organization",
@@ -8052,6 +8088,33 @@
80528088
"additional-permissions": false,
80538089
"access": "read"
80548090
},
8091+
{
8092+
"category": "secret-scanning",
8093+
"slug": "list-alert-dismissal-requests-for-secret-scanning-for-a-repository",
8094+
"subcategory": "alert-dismissal-requests",
8095+
"verb": "get",
8096+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning",
8097+
"additional-permissions": true,
8098+
"access": "read"
8099+
},
8100+
{
8101+
"category": "secret-scanning",
8102+
"slug": "get-an-alert-dismissal-request-for-secret-scanning",
8103+
"subcategory": "alert-dismissal-requests",
8104+
"verb": "get",
8105+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning/{alert_number}",
8106+
"additional-permissions": true,
8107+
"access": "read"
8108+
},
8109+
{
8110+
"category": "secret-scanning",
8111+
"slug": "review-an-alert-dismissal-request-for-secret-scanning",
8112+
"subcategory": "alert-dismissal-requests",
8113+
"verb": "patch",
8114+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning/{alert_number}",
8115+
"additional-permissions": true,
8116+
"access": "read"
8117+
},
80558118
{
80568119
"category": "secret-scanning",
80578120
"slug": "list-secret-scanning-alerts-for-a-repository",

‎src/github-apps/data/ghec-2022-11-28/fine-grained-pat.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5356,6 +5356,12 @@
53565356
"verb": "get",
53575357
"requestPath": "/orgs/{org}/bypass-requests/secret-scanning"
53585358
},
5359+
{
5360+
"slug": "list-alert-dismissal-requests-for-secret-scanning-for-an-org",
5361+
"subcategory": "alert-dismissal-requests",
5362+
"verb": "get",
5363+
"requestPath": "/orgs/{org}/dismissal-requests/secret-scanning"
5364+
},
53595365
{
53605366
"slug": "list-secret-scanning-alerts-for-an-organization",
53615367
"subcategory": "secret-scanning",
@@ -5386,6 +5392,24 @@
53865392
"verb": "delete",
53875393
"requestPath": "/repos/{owner}/{repo}/bypass-responses/secret-scanning/{bypass_response_id}"
53885394
},
5395+
{
5396+
"slug": "list-alert-dismissal-requests-for-secret-scanning-for-a-repository",
5397+
"subcategory": "alert-dismissal-requests",
5398+
"verb": "get",
5399+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning"
5400+
},
5401+
{
5402+
"slug": "get-an-alert-dismissal-request-for-secret-scanning",
5403+
"subcategory": "alert-dismissal-requests",
5404+
"verb": "get",
5405+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning/{alert_number}"
5406+
},
5407+
{
5408+
"slug": "review-an-alert-dismissal-request-for-secret-scanning",
5409+
"subcategory": "alert-dismissal-requests",
5410+
"verb": "patch",
5411+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning/{alert_number}"
5412+
},
53895413
{
53905414
"slug": "list-secret-scanning-alerts-for-a-repository",
53915415
"subcategory": "secret-scanning",

‎src/github-apps/data/ghec-2022-11-28/server-to-server-permissions.json

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6622,6 +6622,39 @@
66226622
"server-to-server": true,
66236623
"additional-permissions": false
66246624
},
6625+
{
6626+
"category": "secret-scanning",
6627+
"slug": "list-alert-dismissal-requests-for-secret-scanning-for-a-repository",
6628+
"subcategory": "alert-dismissal-requests",
6629+
"verb": "get",
6630+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning",
6631+
"access": "read",
6632+
"user-to-server": true,
6633+
"server-to-server": true,
6634+
"additional-permissions": true
6635+
},
6636+
{
6637+
"category": "secret-scanning",
6638+
"slug": "get-an-alert-dismissal-request-for-secret-scanning",
6639+
"subcategory": "alert-dismissal-requests",
6640+
"verb": "get",
6641+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning/{alert_number}",
6642+
"access": "read",
6643+
"user-to-server": true,
6644+
"server-to-server": true,
6645+
"additional-permissions": true
6646+
},
6647+
{
6648+
"category": "secret-scanning",
6649+
"slug": "review-an-alert-dismissal-request-for-secret-scanning",
6650+
"subcategory": "alert-dismissal-requests",
6651+
"verb": "patch",
6652+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning/{alert_number}",
6653+
"access": "read",
6654+
"user-to-server": true,
6655+
"server-to-server": true,
6656+
"additional-permissions": true
6657+
},
66256658
{
66266659
"category": "repos",
66276660
"slug": "create-a-repository-dispatch-event",
@@ -9730,6 +9763,17 @@
97309763
"server-to-server": false,
97319764
"additional-permissions": false
97329765
},
9766+
{
9767+
"category": "secret-scanning",
9768+
"slug": "list-alert-dismissal-requests-for-secret-scanning-for-an-org",
9769+
"subcategory": "alert-dismissal-requests",
9770+
"verb": "get",
9771+
"requestPath": "/orgs/{org}/dismissal-requests/secret-scanning",
9772+
"access": "read",
9773+
"user-to-server": true,
9774+
"server-to-server": true,
9775+
"additional-permissions": false
9776+
},
97339777
{
97349778
"category": "secret-scanning",
97359779
"slug": "list-secret-scanning-alerts-for-an-organization",
@@ -9785,6 +9829,39 @@
97859829
"server-to-server": false,
97869830
"additional-permissions": false
97879831
},
9832+
{
9833+
"category": "secret-scanning",
9834+
"slug": "list-alert-dismissal-requests-for-secret-scanning-for-a-repository",
9835+
"subcategory": "alert-dismissal-requests",
9836+
"verb": "get",
9837+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning",
9838+
"access": "read",
9839+
"user-to-server": true,
9840+
"server-to-server": true,
9841+
"additional-permissions": true
9842+
},
9843+
{
9844+
"category": "secret-scanning",
9845+
"slug": "get-an-alert-dismissal-request-for-secret-scanning",
9846+
"subcategory": "alert-dismissal-requests",
9847+
"verb": "get",
9848+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning/{alert_number}",
9849+
"access": "read",
9850+
"user-to-server": true,
9851+
"server-to-server": true,
9852+
"additional-permissions": true
9853+
},
9854+
{
9855+
"category": "secret-scanning",
9856+
"slug": "review-an-alert-dismissal-request-for-secret-scanning",
9857+
"subcategory": "alert-dismissal-requests",
9858+
"verb": "patch",
9859+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning/{alert_number}",
9860+
"access": "read",
9861+
"user-to-server": true,
9862+
"server-to-server": true,
9863+
"additional-permissions": true
9864+
},
97889865
{
97899866
"category": "secret-scanning",
97909867
"slug": "list-secret-scanning-alerts-for-a-repository",

‎src/github-apps/data/ghec-2022-11-28/server-to-server-rest.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4870,12 +4870,36 @@
48704870
}
48714871
],
48724872
"secret-scanning": [
4873+
{
4874+
"slug": "list-alert-dismissal-requests-for-secret-scanning-for-an-org",
4875+
"subcategory": "alert-dismissal-requests",
4876+
"verb": "get",
4877+
"requestPath": "/orgs/{org}/dismissal-requests/secret-scanning"
4878+
},
48734879
{
48744880
"slug": "list-secret-scanning-alerts-for-an-organization",
48754881
"subcategory": "secret-scanning",
48764882
"verb": "get",
48774883
"requestPath": "/orgs/{org}/secret-scanning/alerts"
48784884
},
4885+
{
4886+
"slug": "list-alert-dismissal-requests-for-secret-scanning-for-a-repository",
4887+
"subcategory": "alert-dismissal-requests",
4888+
"verb": "get",
4889+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning"
4890+
},
4891+
{
4892+
"slug": "get-an-alert-dismissal-request-for-secret-scanning",
4893+
"subcategory": "alert-dismissal-requests",
4894+
"verb": "get",
4895+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning/{alert_number}"
4896+
},
4897+
{
4898+
"slug": "review-an-alert-dismissal-request-for-secret-scanning",
4899+
"subcategory": "alert-dismissal-requests",
4900+
"verb": "patch",
4901+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning/{alert_number}"
4902+
},
48794903
{
48804904
"slug": "list-secret-scanning-alerts-for-a-repository",
48814905
"subcategory": "secret-scanning",

‎src/github-apps/data/ghec-2022-11-28/user-to-server-rest.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5356,6 +5356,12 @@
53565356
"verb": "get",
53575357
"requestPath": "/orgs/{org}/bypass-requests/secret-scanning"
53585358
},
5359+
{
5360+
"slug": "list-alert-dismissal-requests-for-secret-scanning-for-an-org",
5361+
"subcategory": "alert-dismissal-requests",
5362+
"verb": "get",
5363+
"requestPath": "/orgs/{org}/dismissal-requests/secret-scanning"
5364+
},
53595365
{
53605366
"slug": "list-secret-scanning-alerts-for-an-organization",
53615367
"subcategory": "secret-scanning",
@@ -5386,6 +5392,24 @@
53865392
"verb": "delete",
53875393
"requestPath": "/repos/{owner}/{repo}/bypass-responses/secret-scanning/{bypass_response_id}"
53885394
},
5395+
{
5396+
"slug": "list-alert-dismissal-requests-for-secret-scanning-for-a-repository",
5397+
"subcategory": "alert-dismissal-requests",
5398+
"verb": "get",
5399+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning"
5400+
},
5401+
{
5402+
"slug": "get-an-alert-dismissal-request-for-secret-scanning",
5403+
"subcategory": "alert-dismissal-requests",
5404+
"verb": "get",
5405+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning/{alert_number}"
5406+
},
5407+
{
5408+
"slug": "review-an-alert-dismissal-request-for-secret-scanning",
5409+
"subcategory": "alert-dismissal-requests",
5410+
"verb": "patch",
5411+
"requestPath": "/repos/{owner}/{repo}/dismissal-requests/secret-scanning/{alert_number}"
5412+
},
53895413
{
53905414
"slug": "list-secret-scanning-alerts-for-a-repository",
53915415
"subcategory": "secret-scanning",

‎src/github-apps/lib/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@
6060
"2022-11-28"
6161
]
6262
},
63-
"sha": "c5cf21bd038d40077bcb9a9dffd0c8d0691c1d78"
63+
"sha": "a3b90207333d17877bcbab612a4163337ed7148c"
6464
}

‎src/learning-track/lib/get-link-data.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import findPage from '#src/frame/lib/find-page.js'
33
import nonEnterpriseDefaultVersion from '#src/versions/lib/non-enterprise-default-version.js'
44
import removeFPTFromPath from '#src/versions/lib/remove-fpt-from-path.js'
55
import { renderContent } from '#src/content-render/index.js'
6+
import { executeWithFallback } from '#src/languages/lib/render-with-fallback.js'
67

78
// rawLinks is an array of paths: [ '/foo' ]
89
// we need to convert it to an array of localized objects: [ { href: '/en/foo', title: 'Foo', intro: 'Description here' } ]
@@ -41,7 +42,13 @@ async function processLink(link, context, option) {
4142
const opts = { textOnly: true }
4243
const linkHref = link.href || link
4344
// Parse the link in case it includes Liquid conditionals
44-
const linkPath = linkHref.includes('{') ? await renderContent(linkHref, context, opts) : linkHref
45+
const linkPath = linkHref.includes('{')
46+
? await executeWithFallback(
47+
context,
48+
() => renderContent(linkHref, context, opts),
49+
() => '', // todo get english linkHref
50+
)
51+
: linkHref
4552
// If the link was `{% ifversion ghes %}/admin/foo/bar{% endifversion %}`
4653
// the `context.currentVersion` was `enterprise-cloud`, the final
4754
// output would become '' (empty string).

‎src/learning-track/lib/process-learning-tracks.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { renderContent } from '#src/content-render/index.js'
21
import getLinkData from './get-link-data.js'
32
import getApplicableVersions from '#src/versions/lib/get-applicable-versions.js'
43
import { getDataByLanguage } from '#src/data-directory/lib/get-data.js'
4+
import { renderContent } from '#src/content-render/index.js'
55
import { executeWithFallback } from '#src/languages/lib/render-with-fallback.js'
66

77
const renderOpts = { textOnly: true }
@@ -18,7 +18,11 @@ export default async function processLearningTracks(rawLearningTracks, context)
1818
for (const rawTrackName of rawLearningTracks) {
1919
// Track names in frontmatter may include Liquid conditionals.
2020
const renderedTrackName = rawTrackName.includes('{')
21-
? await renderContent(rawTrackName, context, renderOpts)
21+
? await executeWithFallback(
22+
context,
23+
() => renderContent(rawTrackName, context, renderOpts),
24+
() => '', // todo use english rawTrackName
25+
)
2226
: rawTrackName
2327
if (!renderedTrackName) continue
2428

0 commit comments

Comments
 (0)