Merge branch 'main' into 5765-private-profile

Author: Martin Lopes

.devcontainer/test-custom-devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 	"name": "test",
 
 	"settings": {
-		"terminal.integrated.shell.linux": "/bin/csh",
+		"terminal.integrated.shell.linux": "/bin/zsh",
 	},
 
 	// Visual Studio Code extensions which help authoring for docs.github.com.

.vscode/settings.json

@@ -3,5 +3,5 @@
     "**/translations": true
   },
   "workbench.editor.enablePreview": false,
-  "workbench.editor.enablePreviewFromQuickOpen": false  
+  "workbench.editor.enablePreviewFromQuickOpen": false
 }

codespaces-settings.json

@@ -0,0 +1 @@
+"isInternal": true

components/ui/MarkdownContent/MarkdownContent.module.scss

@@ -6,6 +6,7 @@
 .markdownBody {
   a {
     text-decoration: underline;
+    text-underline-offset: 25%;
   }
 
   summary {

content/actions/deployment/targeting-different-environments/using-environments-for-deployment.md

@@ -71,6 +71,14 @@ Secrets stored in an environment are only available to workflow jobs that refere
 
 {% data reusables.actions.permissions-statement-environment %}
 
+{% ifversion fpt or ghec %}
+{% note %}
+
+**Note:** To create an environment in a private repository, your organization must use {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %}
+
+{% endnote %}
+{% endif %}
+
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
 {% data reusables.actions.sidebar-environment %}

content/actions/using-containerized-services/about-service-containers.md

@@ -49,7 +49,7 @@ When a job runs directly on a runner machine, the service running in the Docker
 
 You can use the `services` keyword to create service containers that are part of a job in your workflow. For more information, see [`jobs.<job_id>.services`](/actions/automating-your-workflow-with-github-actions/workflow-syntax-for-github-actions#jobsjob_idservices).
 
-This example creates a service called `redis` in a job called `container-job`. The Docker host in this example is the `node:10.18-jessie` container.
+This example creates a service called `redis` in a job called `container-job`. The Docker host in this example is the `node:16-bullseye` container.
 
 {% raw %}
 ```yaml{:copy}
@@ -62,7 +62,7 @@ jobs:
     # Containers must run in Linux based operating systems
     runs-on: ubuntu-latest
     # Docker Hub image that `container-job` executes in
-    container: node:10.18-jessie
+    container: node:16-bullseye
 
     # Service containers to run with `container-job`
     services:

content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/accessing-the-audit-log-for-your-enterprise.md

@@ -9,6 +9,7 @@ redirect_from:
   - /articles/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
   - /github/setting-up-and-managing-your-enterprise-account/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
   - /github/setting-up-and-managing-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise-account
+  - /admin/user-management/managing-organizations-in-your-enterprise/viewing-the-audit-logs-for-organizations-in-your-enterprise
 versions:
   ghec: '*'
   ghes: '*'

content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/audit-log-events-for-your-enterprise.md

@@ -192,6 +192,16 @@ Action                        | Description
 | `commit_comment.update` | A commit comment was updated.
 {%- endif %}
 
+{%- ifversion ghes %}
+### `config_entry` category actions
+
+| Action | Description
+|--------|-------------
+| `config_entry.create` | A configuration setting was created. These events are only visible in the site admin audit log. The type of events recorded relate to:</br>- Enterprise settings and policies</br>- Organization and repository permissions and settings</br>- Git, Git LFS, {% data variables.product.prodname_github_connect %}, {% data variables.product.prodname_registry %}, project, and code security settings.
+| `config_entry.destroy` | A configuration setting was deleted. These events are only visible in the site admin audit log. The type of events recorded relate to:</br>- Enterprise settings and policies</br>- Organization and repository permissions and settings</br>- Git, Git LFS, {% data variables.product.prodname_github_connect %}, {% data variables.product.prodname_registry %}, project, and code security settings.
+| `config_entry.update` | A configuration setting was edited. These events are only visible in the site admin audit log. The type of events recorded relate to:</br>- Enterprise settings and policies</br>- Organization and repository permissions and settings</br>- Git, Git LFS, {% data variables.product.prodname_github_connect %}, {% data variables.product.prodname_registry %}, project, and code security settings.
+{%- endif %}
+
 {%- ifversion fpt or ghec or ghes > 3.2 or ghae-issue-4864 %}
 ### `dependabot_alerts` category actions
 
@@ -367,6 +377,14 @@ Action                        | Description
 | `external_identity.update` | An Okta user's settings were updated. For more information, see "[Mapping Okta groups to teams](/admin/identity-and-access-management/configuring-authentication-and-provisioning-with-your-identity-provider/mapping-okta-groups-to-teams)."
 {%- endif %}
 
+### `gist` category actions
+
+| Action | Description
+|--------|-------------
+| `gist.create` | A gist is created.
+| `gist.destroy` | A gist is deleted.
+| `gist.visibility_change` | The visibility of a gist is changed.
+
 ### `git` category actions
 
 | Action | Description
@@ -1075,6 +1093,14 @@ Action                        | Description
 | `repository_image.create` | An image to represent a repository was uploaded.
 | `repository_image.destroy` | An image to represent a repository was deleted.
 
+### `repository_invitation` category actions
+
+| Action | Description
+|--------|-------------
+| `repository_invitation.accept` | An invitation to join a repository was accepted.
+| `repository_invitation.create` | An invitation to join a repository was sent.
+| `repository_invitation.reject` | An invitation to join a repository was canceled.
+
 ### `repository_projects_change` category actions
 
 | Action | Description
@@ -1242,10 +1268,18 @@ Action                        | Description
 {%- endif %}
 | `staff.repo_lock`             | An organization{% ifversion ghes %}, repository or site{% else %} or repository{% endif %} administrator locked (temporarily gained full access to) a user's private repository.
 | `staff.repo_unlock`           | An organization{% ifversion ghes %}, repository or site{% else %} or repository{% endif %} administrator unlocked (ended their temporary access to) a user's private repository.
-| `staff.unlock`                | An enterprise owner{% ifversion ghes %} or site administrator{% endif %} unlocked (temporarily gained full access to) all of a user's private repositories.
+{%- ifversion ghes %}
+| `staff.search_audit_log` | A site administrator performed a search of the site admin audit log.
+{%- endif %}
 | `staff.set_domain_token_expiration` | {% ifversion ghes %}A site administrator or {% endif %}GitHub staff set the verification code expiry time for an organization or enterprise domain. {% ifversion ghec or ghes > 3.1 %}For more information, see "[Verifying or approving a domain for your organization](/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization)" and "[Verifying or approving a domain for your enterprise](/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise)."{% endif %}
+{%- ifversion ghes %}
+| `staff.unlock`                | A site administrator unlocked (temporarily gained full access to) all of a user's private repositories.
+{%- endif %}
 | `staff.unverify_domain` | {% ifversion ghes %}A site administrator or {% endif %}GitHub staff unverified an organization or enterprise domain. {% ifversion ghec or ghes > 3.1 %}For more information, see "[Verifying or approving a domain for your organization](/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization)" and "[Verifying or approving a domain for your enterprise](/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise)."{% endif %}
 | `staff.verify_domain` | {% ifversion ghes %}A site administrator or {% endif %}GitHub staff verified an organization or enterprise domain. {% ifversion ghec or ghes > 3.1 %}For more information, see "[Verifying or approving a domain for your organization](/organizations/managing-organization-settings/verifying-or-approving-a-domain-for-your-organization)" and "[Verifying or approving a domain for your enterprise](/admin/configuration/configuring-your-enterprise/verifying-or-approving-a-domain-for-your-enterprise)."{% endif %}
+{%- ifversion ghes %}
+| `staff.view_audit_log` | A site administrator viewed the site admin audit log.
+{%- endif %}
 
 ### `team` category actions
 

content/code-security/security-overview/about-the-security-overview.md

@@ -22,7 +22,9 @@ topics:
 shortTitle: About security overview
 ---
 
+{% ifversion ghes < 3.5 or ghae-issue-4554 %}
 {% data reusables.security-center.beta %}
+{% endif %}
 
 ## About the security overview
 

content/code-security/security-overview/filtering-alerts-in-the-security-overview.md

@@ -17,7 +17,9 @@ topics:
 shortTitle: Filtering alerts
 ---
 
+{% ifversion ghes < 3.5 or ghae-issue-4554 %}
 {% data reusables.security-center.beta %}
+{% endif %}
 
 ## About filtering the security overview