Skip to content

Commit c20e5a5

Browse files
authored
Merge pull request #35297 from github/repo-sync
Repo sync
2 parents 2da1ee5 + 6530203 commit c20e5a5

File tree

15 files changed

+182
-46
lines changed

15 files changed

+182
-46
lines changed

src/audit-logs/data/fpt/organization.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
},
4242
{
4343
"action": "auto_approve_personal_access_token_requests.disable",
44-
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources.",
44+
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources. See also: personal_access_token.auto_approve_grant_requests_disabled",
4545
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
4646
},
4747
{
4848
"action": "auto_approve_personal_access_token_requests.enable",
49-
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval.",
49+
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval. See also: personal_access_token.auto_approve_grant_requests_enabled",
5050
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
5151
},
5252
{

src/audit-logs/data/fpt/user.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,11 @@
669669
"description": "An authorization for an OAuth application was deleted.",
670670
"docs_reference_links": "/apps/using-github-apps/reviewing-your-authorized-integrations"
671671
},
672+
{
673+
"action": "oauth_authorization.update",
674+
"description": "An authorization for an OAuth application was updated.",
675+
"docs_reference_links": "/apps/oauth-apps/using-oauth-apps/authorizing-oauth-apps"
676+
},
672677
{
673678
"action": "org.add_member",
674679
"description": "A user joined an organization.",

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

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@
6666
},
6767
{
6868
"action": "auto_approve_personal_access_token_requests.disable",
69-
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources.",
69+
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources. See also: personal_access_token.auto_approve_grant_requests_disabled",
7070
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
7171
},
7272
{
7373
"action": "auto_approve_personal_access_token_requests.enable",
74-
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval.",
74+
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval. See also: personal_access_token.auto_approve_grant_requests_enabled",
7575
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
7676
},
7777
{
@@ -1279,16 +1279,6 @@
12791279
"description": "An external identity was updated.",
12801280
"docs_reference_links": "N/A"
12811281
},
1282-
{
1283-
"action": "forbid_auto_approve_personal_access_token_requests.disable",
1284-
"description": "Auto-approve policy for fine-grained personal access tokens was enabled for the organization.",
1285-
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization#enforcing-an-approval-policy-for-fine-grained-personal-access-tokens"
1286-
},
1287-
{
1288-
"action": "forbid_auto_approve_personal_access_token_requests.enable",
1289-
"description": "Auto-approve policy for fine-grained personal access tokens was disabled for the organization.",
1290-
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization#enforcing-an-approval-policy-for-fine-grained-personal-access-tokens"
1291-
},
12921282
{
12931283
"action": "git.clone",
12941284
"description": "A repository was cloned.",
@@ -3879,6 +3869,36 @@
38793869
"description": "A user requested to bypass secret scanning push protection.",
38803870
"docs_reference_links": "/code-security/secret-scanning/working-with-push-protection#requesting-bypass-privileges-when-working-with-the-command-line"
38813871
},
3872+
{
3873+
"action": "security_configuration.create",
3874+
"description": "A security configuration was created",
3875+
"docs_reference_links": "N/A"
3876+
},
3877+
{
3878+
"action": "security_configuration_default.delete",
3879+
"description": "A default security configuration setting for new repositories was removed.",
3880+
"docs_reference_links": "N/A"
3881+
},
3882+
{
3883+
"action": "security_configuration_default.update",
3884+
"description": "A default security configuration setting for new repositories was updated.",
3885+
"docs_reference_links": "N/A"
3886+
},
3887+
{
3888+
"action": "security_configuration.delete",
3889+
"description": "A security configuration was deleted",
3890+
"docs_reference_links": "N/A"
3891+
},
3892+
{
3893+
"action": "security_configuration_policy.update",
3894+
"description": "A security configuration policy was updated",
3895+
"docs_reference_links": "N/A"
3896+
},
3897+
{
3898+
"action": "security_configuration.update",
3899+
"description": "A security configuration was updated",
3900+
"docs_reference_links": "N/A"
3901+
},
38823902
{
38833903
"action": "sponsors.agreement_sign",
38843904
"description": "A GitHub Sponsors agreement was signed on behalf of an organization.",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
},
4242
{
4343
"action": "auto_approve_personal_access_token_requests.disable",
44-
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources.",
44+
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources. See also: personal_access_token.auto_approve_grant_requests_disabled",
4545
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
4646
},
4747
{
4848
"action": "auto_approve_personal_access_token_requests.enable",
49-
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval.",
49+
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval. See also: personal_access_token.auto_approve_grant_requests_enabled",
5050
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
5151
},
5252
{

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,11 @@
669669
"description": "An authorization for an OAuth application was deleted.",
670670
"docs_reference_links": "/apps/using-github-apps/reviewing-your-authorized-integrations"
671671
},
672+
{
673+
"action": "oauth_authorization.update",
674+
"description": "An authorization for an OAuth application was updated.",
675+
"docs_reference_links": "/apps/oauth-apps/using-oauth-apps/authorizing-oauth-apps"
676+
},
672677
{
673678
"action": "org.add_member",
674679
"description": "A user joined an organization.",

src/audit-logs/data/ghes-3.11/organization.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
},
4242
{
4343
"action": "auto_approve_personal_access_token_requests.disable",
44-
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources.",
44+
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources. See also: personal_access_token.auto_approve_grant_requests_disabled",
4545
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
4646
},
4747
{
4848
"action": "auto_approve_personal_access_token_requests.enable",
49-
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval.",
49+
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval. See also: personal_access_token.auto_approve_grant_requests_enabled",
5050
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
5151
},
5252
{

src/audit-logs/data/ghes-3.12/organization.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
},
4242
{
4343
"action": "auto_approve_personal_access_token_requests.disable",
44-
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources.",
44+
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources. See also: personal_access_token.auto_approve_grant_requests_disabled",
4545
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
4646
},
4747
{
4848
"action": "auto_approve_personal_access_token_requests.enable",
49-
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval.",
49+
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval. See also: personal_access_token.auto_approve_grant_requests_enabled",
5050
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
5151
},
5252
{

src/audit-logs/data/ghes-3.13/organization.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
},
4242
{
4343
"action": "auto_approve_personal_access_token_requests.disable",
44-
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources.",
44+
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources. See also: personal_access_token.auto_approve_grant_requests_disabled",
4545
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
4646
},
4747
{
4848
"action": "auto_approve_personal_access_token_requests.enable",
49-
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval.",
49+
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval. See also: personal_access_token.auto_approve_grant_requests_enabled",
5050
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
5151
},
5252
{

src/audit-logs/data/ghes-3.14/organization.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
},
4242
{
4343
"action": "auto_approve_personal_access_token_requests.disable",
44-
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources.",
44+
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources. See also: personal_access_token.auto_approve_grant_requests_disabled",
4545
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
4646
},
4747
{
4848
"action": "auto_approve_personal_access_token_requests.enable",
49-
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval.",
49+
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval. See also: personal_access_token.auto_approve_grant_requests_enabled",
5050
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
5151
},
5252
{

src/audit-logs/data/ghes-3.15/organization.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@
4141
},
4242
{
4343
"action": "auto_approve_personal_access_token_requests.disable",
44-
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources.",
44+
"description": "Triggered when the organization must approve fine-grained personal access tokens before the tokens can access organization resources. See also: personal_access_token.auto_approve_grant_requests_disabled",
4545
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
4646
},
4747
{
4848
"action": "auto_approve_personal_access_token_requests.enable",
49-
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval.",
49+
"description": "Triggered when fine-grained personal access tokens can access organization resources without prior approval. See also: personal_access_token.auto_approve_grant_requests_enabled",
5050
"docs_reference_links": "/organizations/managing-programmatic-access-to-your-organization/setting-a-personal-access-token-policy-for-your-organization"
5151
},
5252
{

src/audit-logs/lib/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
"apiOnlyEvents": "This event is not available in the web interface, only via the REST API, audit log streaming, or JSON/CSV exports.",
44
"apiRequestEvent": "This event is only available via audit log streaming."
55
},
6-
"sha": "0f178a562a0c8017d95657f31865a541f44c3a03"
6+
"sha": "61a843e468c47922c5b4504d9710fc4ea5608d05"
77
}

src/landings/components/CookBookArticleCard.tsx

Lines changed: 45 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,37 @@
11
import { Label, LabelGroup, Link } from '@primer/react'
2-
import { BugIcon } from '@primer/octicons-react'
2+
import {
3+
BugIcon,
4+
LightBulbIcon,
5+
CodeIcon,
6+
GearIcon,
7+
RocketIcon,
8+
BeakerIcon,
9+
CopilotIcon,
10+
HubotIcon,
11+
LogIcon,
12+
TerminalIcon,
13+
BookIcon,
14+
} from '@primer/octicons-react'
15+
16+
const Icons = {
17+
bug: BugIcon,
18+
lightbulb: LightBulbIcon,
19+
code: CodeIcon,
20+
gear: GearIcon,
21+
rocket: RocketIcon,
22+
beaker: BeakerIcon,
23+
copilot: CopilotIcon,
24+
hubot: HubotIcon,
25+
log: LogIcon,
26+
terminal: TerminalIcon,
27+
book: BookIcon,
28+
}
29+
30+
type IconType = keyof typeof Icons
331

432
type Props = {
533
title?: string
6-
icon?: string
34+
icon?: IconType
735
url?: string
836
description?: string
937
tags?: string[]
@@ -17,18 +45,7 @@ const defaultProps = {
1745
description:
1846
'Man bun letterpress put a bird on it la croix offal, meh grailed hot chicken kombucha gochujang messenger bag fit before they sold out lyft.',
1947
tags: ['Tag Example', 'Tag Example'],
20-
icon: 'bugicon',
21-
}
22-
23-
function setIcon(icon: string) {
24-
switch (icon) {
25-
case 'bugicon':
26-
return <BugIcon size={48} className="mr-4 bgColor-accent-muted p-3 circle fgColor-accent" />
27-
case 'none':
28-
return null
29-
default:
30-
return null
31-
}
48+
icon: 'book',
3249
}
3350

3451
function setImage(image: string) {
@@ -51,21 +68,33 @@ function setImage(image: string) {
5168
const spotlightClasses = 'd-flex flex-column align-items-center'
5269
export const CookBookArticleCard = ({
5370
title = defaultProps.title,
54-
icon = defaultProps.icon,
71+
icon = defaultProps.icon as IconType,
5572
tags = defaultProps.tags,
5673
description = defaultProps.description,
5774
image = '',
5875
url,
5976
spotlight = false,
6077
}: Props) => {
78+
const setIcon = (icon: keyof typeof Icons) => {
79+
return Icons[icon] || CopilotIcon
80+
}
81+
82+
const IconComponent = setIcon(icon as keyof typeof Icons)
6183
return (
6284
<div className="m-2">
6385
<div
6486
style={{ minHeight: 200 }}
6587
className={spotlight ? spotlightClasses : 'd-flex pb-3 border-bottom'}
6688
>
6789
{spotlight ? setImage(image) : null}
68-
{spotlight ? setIcon('none') : setIcon(icon)}
90+
{spotlight
91+
? null
92+
: IconComponent && (
93+
<IconComponent
94+
size={48}
95+
className="mr-4 bgColor-accent-muted p-3 circle fgColor-accent"
96+
/>
97+
)}
6998
<div>
7099
<Link href={url}>
71100
<h3 className="h4">{title}</h3>

src/landings/types.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,18 @@ export type BaseTocItem = {
55
}
66

77
export type ChildTocItem = BaseTocItem & {
8-
octicon?: string
8+
octicon?:
9+
| 'code'
10+
| 'log'
11+
| 'terminal'
12+
| 'bug'
13+
| 'lightbulb'
14+
| 'gear'
15+
| 'rocket'
16+
| 'beaker'
17+
| 'copilot'
18+
| 'hubot'
19+
| 'book'
920
category?: string[]
1021
complexity?: string[]
1122
industry?: string[]

0 commit comments

Comments
 (0)