Skip to content

Commit 149b0f8

Browse files
authored
Merge pull request github#18612 from github/repo-sync
repo sync
2 parents aba24ec + f4b4721 commit 149b0f8

File tree

14 files changed

+2301
-127
lines changed

14 files changed

+2301
-127
lines changed

content/admin/enterprise-management/caching-repositories/configuring-a-repository-cache.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ Then, when told to fetch `https://github.example.com/myorg/myrepo`, Git will ins
6262
$ ghe-repl-setup <em>PRIMARY IP</em>
6363
```
6464

65-
1. Set a `cache_location` for the repository cache, replacing *CACHE-LOCATION* with an alphanumeric identifier, such as the region where the cache is deployed.
65+
1. Set a `cache_location` for the repository cache, replacing *CACHE-LOCATION* with an alphanumeric identifier, such as the region where the cache is deployed. Also set a datacenter name for this cache; new caches will attempt to seed from another cache in the same datacenter.
6666

6767
```shell
68-
$ ghe-repl-node --cache <em>CACHE-LOCATION</em>
68+
$ ghe-repl-node --cache <em>CACHE-LOCATION</em> --datacenter <em>REPLICA-DC-NAME</em>
6969
```
7070

7171
{% data reusables.enterprise_installation.replication-command %}

content/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/configuring-oidc-for-enterprise-managed-users.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ If you currently use SAML SSO for authentication and would prefer to use OIDC an
2828

2929
## Identity provider support
3030

31-
Support for OIDC is in public beta and available for customers using Azure Active Directory (Azure AD).
31+
Support for OIDC is in public beta and available for customers using Azure Active Directory (Azure AD).
32+
33+
Each Azure AD tenant can support only one OIDC integration with {% data variables.product.prodname_emus %}. If you want to connect Azure AD to more than one enterprise on {% data variables.product.prodname_dotcom %}, use SAML instead. For more information, see "[Configuring SAML single sign-on for {% data variables.product.prodname_emus %}](/admin/identity-and-access-management/using-enterprise-managed-users-for-iam/configuring-saml-single-sign-on-for-enterprise-managed-users)."
3234

3335
## Configuring OIDC for Enterprise Managed Users
3436

@@ -44,4 +46,4 @@ Support for OIDC is in public beta and available for customers using Azure Activ
4446

4547
## Enabling provisioning
4648

47-
After you enable OIDC SSO, enable provisioning. For more information, see "[Configuring SCIM provisioning for enterprise managed users](/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users)."
49+
After you enable OIDC SSO, enable provisioning. For more information, see "[Configuring SCIM provisioning for enterprise managed users](/admin/identity-and-access-management/managing-iam-with-enterprise-managed-users/configuring-scim-provisioning-for-enterprise-managed-users)."

lib/rest/static/decorated/api.github.com.json

Lines changed: 1105 additions & 109 deletions
Large diffs are not rendered by default.

lib/rest/static/decorated/ghes-3.1.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382382,6 +382382,7 @@
382382382382
"created_at": "2020-11-06T18:48:51Z",
382383382383
"url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/2",
382384382384
"html_url": "https://github.com/owner/private-repo/security/secret-scanning/2",
382385+
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/2/locations",
382385382386
"state": "resolved",
382386382387
"resolution": "false_positive",
382387382388
"resolved_at": "2020-11-07T02:47:13Z",
@@ -382406,18 +382407,21 @@
382406382407
"site_admin": true
382407382408
},
382408382409
"secret_type": "adafruit_io_key",
382410+
"secret_type_display_name": "Adafruit IO Key",
382409382411
"secret": "aio_XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
382410382412
},
382411382413
{
382412382414
"number": 1,
382413382415
"created_at": "2020-11-06T18:18:30Z",
382414382416
"url": "https://api.github.com/repos/owner/repo/secret-scanning/alerts/1",
382415382417
"html_url": "https://github.com/owner/repo/security/secret-scanning/1",
382418+
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/1/locations",
382416382419
"state": "open",
382417382420
"resolution": null,
382418382421
"resolved_at": null,
382419382422
"resolved_by": null,
382420382423
"secret_type": "mailchimp_api_key",
382424+
"secret_type_display_name": "Mailchimp API Key",
382421382425
"secret": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-us2"
382422382426
}
382423382427
],

lib/rest/static/decorated/ghes-3.2.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390879,6 +390879,7 @@
390879390879
"created_at": "2020-11-06T18:48:51Z",
390880390880
"url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/2",
390881390881
"html_url": "https://github.com/owner/private-repo/security/secret-scanning/2",
390882+
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/2/locations",
390882390883
"state": "resolved",
390883390884
"resolution": "false_positive",
390884390885
"resolved_at": "2020-11-07T02:47:13Z",
@@ -390903,18 +390904,21 @@
390903390904
"site_admin": true
390904390905
},
390905390906
"secret_type": "adafruit_io_key",
390907+
"secret_type_display_name": "Adafruit IO Key",
390906390908
"secret": "aio_XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
390907390909
},
390908390910
{
390909390911
"number": 1,
390910390912
"created_at": "2020-11-06T18:18:30Z",
390911390913
"url": "https://api.github.com/repos/owner/repo/secret-scanning/alerts/1",
390912390914
"html_url": "https://github.com/owner/repo/security/secret-scanning/1",
390915+
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/1/locations",
390913390916
"state": "open",
390914390917
"resolution": null,
390915390918
"resolved_at": null,
390916390919
"resolved_by": null,
390917390920
"secret_type": "mailchimp_api_key",
390921+
"secret_type_display_name": "Mailchimp API Key",
390918390922
"secret": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-us2"
390919390923
}
390920390924
],

lib/rest/static/decorated/ghes-3.3.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386582,6 +386582,7 @@
386582386582
"created_at": "2020-11-06T18:48:51Z",
386583386583
"url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/2",
386584386584
"html_url": "https://github.com/owner/private-repo/security/secret-scanning/2",
386585+
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/2/locations",
386585386586
"state": "resolved",
386586386587
"resolution": "false_positive",
386587386588
"resolved_at": "2020-11-07T02:47:13Z",
@@ -386606,6 +386607,7 @@
386606386607
"site_admin": true
386607386608
},
386608386609
"secret_type": "adafruit_io_key",
386610+
"secret_type_display_name": "Adafruit IO Key",
386609386611
"secret": "aio_XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
386610386612
"repository": {
386611386613
"id": 1296269,
@@ -386838,11 +386840,13 @@
386838386840
"created_at": "2020-11-06T18:18:30Z",
386839386841
"url": "https://api.github.com/repos/owner/repo/secret-scanning/alerts/1",
386840386842
"html_url": "https://github.com/owner/repo/security/secret-scanning/1",
386843+
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/1/locations",
386841386844
"state": "open",
386842386845
"resolution": null,
386843386846
"resolved_at": null,
386844386847
"resolved_by": null,
386845386848
"secret_type": "mailchimp_api_key",
386849+
"secret_type_display_name": "Mailchimp API Key",
386846386850
"secret": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-us2",
386847386851
"repository": {
386848386852
"id": 1296269,
@@ -387087,6 +387091,19 @@
387087387091
"format": "date-time",
387088387092
"readOnly": true
387089387093
},
387094+
"updated_at": {
387095+
"anyOf": [
387096+
{
387097+
"type": "null"
387098+
},
387099+
{
387100+
"type": "string",
387101+
"description": "The time that the alert was last updated in ISO 8601 format: `YYYY-MM-DDTHH:MM:SSZ`.",
387102+
"format": "date-time",
387103+
"readOnly": true
387104+
}
387105+
]
387106+
},
387090387107
"url": {
387091387108
"type": "string",
387092387109
"description": "The REST API URL of the alert resource.",
@@ -389535,6 +389552,7 @@
389535389552
"created_at": "2020-11-06T18:48:51Z",
389536389553
"url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/2",
389537389554
"html_url": "https://github.com/owner/private-repo/security/secret-scanning/2",
389555+
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/2/locations",
389538389556
"state": "resolved",
389539389557
"resolution": "false_positive",
389540389558
"resolved_at": "2020-11-07T02:47:13Z",
@@ -389559,18 +389577,21 @@
389559389577
"site_admin": true
389560389578
},
389561389579
"secret_type": "adafruit_io_key",
389580+
"secret_type_display_name": "Adafruit IO Key",
389562389581
"secret": "aio_XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
389563389582
},
389564389583
{
389565389584
"number": 1,
389566389585
"created_at": "2020-11-06T18:18:30Z",
389567389586
"url": "https://api.github.com/repos/owner/repo/secret-scanning/alerts/1",
389568389587
"html_url": "https://github.com/owner/repo/security/secret-scanning/1",
389588+
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/1/locations",
389569389589
"state": "open",
389570389590
"resolution": null,
389571389591
"resolved_at": null,
389572389592
"resolved_by": null,
389573389593
"secret_type": "mailchimp_api_key",
389594+
"secret_type_display_name": "Mailchimp API Key",
389574389595
"secret": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-us2"
389575389596
}
389576389597
],

lib/rest/static/decorated/ghes-3.4.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406626,6 +406626,7 @@
406626406626
"created_at": "2020-11-06T18:48:51Z",
406627406627
"url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/2",
406628406628
"html_url": "https://github.com/owner/private-repo/security/secret-scanning/2",
406629+
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/2/locations",
406629406630
"state": "resolved",
406630406631
"resolution": "false_positive",
406631406632
"resolved_at": "2020-11-07T02:47:13Z",
@@ -406650,6 +406651,7 @@
406650406651
"site_admin": true
406651406652
},
406652406653
"secret_type": "adafruit_io_key",
406654+
"secret_type_display_name": "Adafruit IO Key",
406653406655
"secret": "aio_XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
406654406656
"repository": {
406655406657
"id": 1296269,
@@ -406882,11 +406884,13 @@
406882406884
"created_at": "2020-11-06T18:18:30Z",
406883406885
"url": "https://api.github.com/repos/owner/repo/secret-scanning/alerts/1",
406884406886
"html_url": "https://github.com/owner/repo/security/secret-scanning/1",
406887+
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/1/locations",
406885406888
"state": "open",
406886406889
"resolution": null,
406887406890
"resolved_at": null,
406888406891
"resolved_by": null,
406889406892
"secret_type": "mailchimp_api_key",
406893+
"secret_type_display_name": "Mailchimp API Key",
406890406894
"secret": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-us2",
406891406895
"repository": {
406892406896
"id": 1296269,
@@ -407131,6 +407135,19 @@
407131407135
"format": "date-time",
407132407136
"readOnly": true
407133407137
},
407138+
"updated_at": {
407139+
"anyOf": [
407140+
{
407141+
"type": "null"
407142+
},
407143+
{
407144+
"type": "string",
407145+
"description": "The time that the alert was last updated in ISO 8601 format: `YYYY-MM-DDTHH:MM:SSZ`.",
407146+
"format": "date-time",
407147+
"readOnly": true
407148+
}
407149+
]
407150+
},
407134407151
"url": {
407135407152
"type": "string",
407136407153
"description": "The REST API URL of the alert resource.",
@@ -409569,6 +409586,7 @@
409569409586
"created_at": "2020-11-06T18:48:51Z",
409570409587
"url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/2",
409571409588
"html_url": "https://github.com/owner/private-repo/security/secret-scanning/2",
409589+
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/2/locations",
409572409590
"state": "resolved",
409573409591
"resolution": "false_positive",
409574409592
"resolved_at": "2020-11-07T02:47:13Z",
@@ -409593,6 +409611,7 @@
409593409611
"site_admin": true
409594409612
},
409595409613
"secret_type": "adafruit_io_key",
409614+
"secret_type_display_name": "Adafruit IO Key",
409596409615
"secret": "aio_XXXXXXXXXXXXXXXXXXXXXXXXXXXX",
409597409616
"repository": {
409598409617
"id": 1296269,
@@ -409825,11 +409844,13 @@
409825409844
"created_at": "2020-11-06T18:18:30Z",
409826409845
"url": "https://api.github.com/repos/owner/repo/secret-scanning/alerts/1",
409827409846
"html_url": "https://github.com/owner/repo/security/secret-scanning/1",
409847+
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/1/locations",
409828409848
"state": "open",
409829409849
"resolution": null,
409830409850
"resolved_at": null,
409831409851
"resolved_by": null,
409832409852
"secret_type": "mailchimp_api_key",
409853+
"secret_type_display_name": "Mailchimp API Key",
409833409854
"secret": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-us2",
409834409855
"repository": {
409835409856
"id": 1296269,
@@ -410074,6 +410095,19 @@
410074410095
"format": "date-time",
410075410096
"readOnly": true
410076410097
},
410098+
"updated_at": {
410099+
"anyOf": [
410100+
{
410101+
"type": "null"
410102+
},
410103+
{
410104+
"type": "string",
410105+
"description": "The time that the alert was last updated in ISO 8601 format: `YYYY-MM-DDTHH:MM:SSZ`.",
410106+
"format": "date-time",
410107+
"readOnly": true
410108+
}
410109+
]
410110+
},
410077410111
"url": {
410078410112
"type": "string",
410079410113
"description": "The REST API URL of the alert resource.",
@@ -412522,6 +412556,7 @@
412522412556
"created_at": "2020-11-06T18:48:51Z",
412523412557
"url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/2",
412524412558
"html_url": "https://github.com/owner/private-repo/security/secret-scanning/2",
412559+
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/2/locations",
412525412560
"state": "resolved",
412526412561
"resolution": "false_positive",
412527412562
"resolved_at": "2020-11-07T02:47:13Z",
@@ -412546,18 +412581,21 @@
412546412581
"site_admin": true
412547412582
},
412548412583
"secret_type": "adafruit_io_key",
412584+
"secret_type_display_name": "Adafruit IO Key",
412549412585
"secret": "aio_XXXXXXXXXXXXXXXXXXXXXXXXXXXX"
412550412586
},
412551412587
{
412552412588
"number": 1,
412553412589
"created_at": "2020-11-06T18:18:30Z",
412554412590
"url": "https://api.github.com/repos/owner/repo/secret-scanning/alerts/1",
412555412591
"html_url": "https://github.com/owner/repo/security/secret-scanning/1",
412592+
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/1/locations",
412556412593
"state": "open",
412557412594
"resolution": null,
412558412595
"resolved_at": null,
412559412596
"resolved_by": null,
412560412597
"secret_type": "mailchimp_api_key",
412598+
"secret_type_display_name": "Mailchimp API Key",
412561412599
"secret": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-us2"
412562412600
}
412563412601
],

lib/rest/static/decorated/ghes-3.5.json

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -419439,6 +419439,19 @@
419439419439
"format": "date-time",
419440419440
"readOnly": true
419441419441
},
419442+
"updated_at": {
419443+
"anyOf": [
419444+
{
419445+
"type": "null"
419446+
},
419447+
{
419448+
"type": "string",
419449+
"description": "The time that the alert was last updated in ISO 8601 format: `YYYY-MM-DDTHH:MM:SSZ`.",
419450+
"format": "date-time",
419451+
"readOnly": true
419452+
}
419453+
]
419454+
},
419442419455
"url": {
419443419456
"type": "string",
419444419457
"description": "The REST API URL of the alert resource.",
@@ -422396,6 +422409,19 @@
422396422409
"format": "date-time",
422397422410
"readOnly": true
422398422411
},
422412+
"updated_at": {
422413+
"anyOf": [
422414+
{
422415+
"type": "null"
422416+
},
422417+
{
422418+
"type": "string",
422419+
"description": "The time that the alert was last updated in ISO 8601 format: `YYYY-MM-DDTHH:MM:SSZ`.",
422420+
"format": "date-time",
422421+
"readOnly": true
422422+
}
422423+
]
422424+
},
422399422425
"url": {
422400422426
"type": "string",
422401422427
"description": "The REST API URL of the alert resource.",
@@ -425232,9 +425258,6 @@
425232425258
"html_url": "https://github.com/owner/private-repo/security/secret-scanning/42",
425233425259
"locations_url": "https://api.github.com/repos/owner/private-repo/secret-scanning/alerts/42/locations",
425234425260
"state": "open",
425235-
"resolution": null,
425236-
"resolved_at": null,
425237-
"resolved_by": null,
425238425261
"secret_type": "mailchimp_api_key",
425239425262
"secret_type_display_name": "Mailchimp API Key",
425240425263
"secret": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-us2"

0 commit comments

Comments
 (0)