Merge pull request github#34392 from github/repo-sync

Repo sync
seanb95531 · Aug 23, 2024 · f53ce23 · f53ce23
2 parents 7e52d8b + 276b364
commit f53ce23
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 9 deletions.
diff --git a/src/audit-logs/data/fpt/organization.json b/src/audit-logs/data/fpt/organization.json
@@ -1134,6 +1134,11 @@
     "description": "An owner revoked authorized credentials.",
     "docs_reference_links": "/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization"
   },
+  {
+    "action": "org.delete",
+    "description": "An organization was deleted by a user or staff.",
+    "docs_reference_links": "N/A"
+  },
   {
     "action": "org.disable_member_team_creation_permission",
     "description": "Team creation was limited to owners.",

diff --git a/src/audit-logs/data/ghec/enterprise.json b/src/audit-logs/data/ghec/enterprise.json
@@ -1409,6 +1409,11 @@
     "description": "An IP allow list was disabled for installed GitHub Apps.",
     "docs_reference_links": "N/A"
   },
+  {
+    "action": "ip_allow_list.disable_idp_ip_allowlist_for_web",
+    "description": "Identity Provider based IP allow list for web interactions was disabled.",
+    "docs_reference_links": "N/A"
+  },
   {
     "action": "ip_allow_list.disable_skip_idp_ip_allowlist_app_access",
     "description": "N/A",
@@ -1429,6 +1434,11 @@
     "description": "An IP allow list was enabled for installed GitHub Apps.",
     "docs_reference_links": "N/A"
   },
+  {
+    "action": "ip_allow_list.enable_idp_ip_allowlist_for_web",
+    "description": "Identity Provider based IP allow list for web interactions was enabled.",
+    "docs_reference_links": "N/A"
+  },
   {
     "action": "ip_allow_list.enable_skip_idp_ip_allowlist_app_access",
     "description": "N/A",

diff --git a/src/audit-logs/data/ghec/organization.json b/src/audit-logs/data/ghec/organization.json
@@ -1134,6 +1134,11 @@
     "description": "An owner revoked authorized credentials.",
     "docs_reference_links": "/organizations/granting-access-to-your-organization-with-saml-single-sign-on/viewing-and-managing-a-members-saml-access-to-your-organization"
   },
+  {
+    "action": "org.delete",
+    "description": "An organization was deleted by a user or staff.",
+    "docs_reference_links": "N/A"
+  },
   {
     "action": "org.disable_member_team_creation_permission",
     "description": "Team creation was limited to owners.",

diff --git a/src/audit-logs/data/ghes-3.10/enterprise.json b/src/audit-logs/data/ghes-3.10/enterprise.json
@@ -1186,7 +1186,7 @@
   },
   {
     "action": "org.delete",
-    "description": "An organization was deleted by a user-initiated background job.",
+    "description": "An organization was deleted by a user or staff.",
     "docs_reference_links": "N/A"
   },
   {

diff --git a/src/audit-logs/data/ghes-3.11/enterprise.json b/src/audit-logs/data/ghes-3.11/enterprise.json
@@ -1231,7 +1231,7 @@
   },
   {
     "action": "org.delete",
-    "description": "An organization was deleted by a user-initiated background job.",
+    "description": "An organization was deleted by a user or staff.",
     "docs_reference_links": "N/A"
   },
   {

diff --git a/src/audit-logs/data/ghes-3.12/enterprise.json b/src/audit-logs/data/ghes-3.12/enterprise.json
@@ -1261,7 +1261,7 @@
   },
   {
     "action": "org.delete",
-    "description": "An organization was deleted by a user-initiated background job.",
+    "description": "An organization was deleted by a user or staff.",
     "docs_reference_links": "N/A"
   },
   {

diff --git a/src/audit-logs/data/ghes-3.13/enterprise.json b/src/audit-logs/data/ghes-3.13/enterprise.json
@@ -1291,7 +1291,7 @@
   },
   {
     "action": "org.delete",
-    "description": "An organization was deleted by a user-initiated background job.",
+    "description": "An organization was deleted by a user or staff.",
     "docs_reference_links": "N/A"
   },
   {

diff --git a/src/audit-logs/data/ghes-3.14/enterprise.json b/src/audit-logs/data/ghes-3.14/enterprise.json
@@ -1446,7 +1446,7 @@
   },
   {
     "action": "org.delete",
-    "description": "An organization was deleted by a user-initiated background job.",
+    "description": "An organization was deleted by a user or staff.",
     "docs_reference_links": "N/A"
   },
   {

diff --git a/src/audit-logs/lib/config.json b/src/audit-logs/lib/config.json
@@ -3,5 +3,5 @@
     "apiOnlyEvents": "This event is not available in the web interface, only via the REST API, audit log streaming, or JSON/CSV exports.",
     "apiRequestEvent": "This event is only available via audit log streaming."
   },
-  "sha": "f978d4dc575235ddf4fbc9dcdc1c305b89170245"
+  "sha": "f009bceca206a469f57dff1a04220886df2d70ec"
 }
diff --git a/src/events/components/Survey.module.scss b/src/events/components/Survey.module.scss
@@ -4,5 +4,7 @@
 }
 
 .customRadio:focus + label {
-  box-shadow: 0 0 1px 3px var(--color-accent-muted);
+  outline: 2px solid var(--fgColor-accent, var(--color-accent-fg));
+  outline-offset: -2px;
+  box-shadow: 0 0 0 3px inset;
 }
diff --git a/src/frame/components/ui/ScrollButton/ScrollButton.module.scss b/src/frame/components/ui/ScrollButton/ScrollButton.module.scss
@@ -10,6 +10,9 @@
   opacity: 1;
 }
 
-.customFocus:focus {
-  box-shadow: 0 0 1px 3px var(--color-accent-muted);
+.customFocus:focus:not(:focus-visible), // override primer css specificity
+.customFocus:focus-visible {
+  outline: 2px solid var(--fgColor-accent, var(--color-accent-fg));
+  outline-offset: -2px;
+  box-shadow: 0 0 0 4px inset; // A little wider for the border radius :shrug:
 }