From 1a433a98c55c2258afacc7e0a9418c8dd81eb446 Mon Sep 17 00:00:00 2001 From: Robert Sese <734194+rsese@users.noreply.github.com> Date: Thu, 2 Mar 2023 17:04:08 -0600 Subject: [PATCH 1/3] release notes schema: `sections` can be an array of objects rather than an object (#35265) --- tests/helpers/schemas/release-notes-schema.js | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/tests/helpers/schemas/release-notes-schema.js b/tests/helpers/schemas/release-notes-schema.js index c43bc62ee9e9..db4f3f553389 100644 --- a/tests/helpers/schemas/release-notes-schema.js +++ b/tests/helpers/schemas/release-notes-schema.js @@ -6,17 +6,20 @@ const section = { minItems: 1, }, { - type: 'object', - properties: { - heading: { - type: 'string', - required: true, - }, - notes: { - type: 'array', - items: { type: 'string' }, - required: true, - minItems: 1, + type: 'array', + items: { + type: 'object', + properties: { + heading: { + type: 'string', + required: true, + }, + notes: { + type: 'array', + items: { type: 'string' }, + required: true, + minItems: 1, + }, }, }, }, From f6cfa0020cc8b3f6d1f404f4e9ee7512ebaaf7a1 Mon Sep 17 00:00:00 2001 From: Rachael Rose Renk <91027132+rachaelrenk@users.noreply.github.com> Date: Thu, 2 Mar 2023 16:09:44 -0700 Subject: [PATCH 2/3] Enterprise Bug Fixes Week of 2/6/2023 (#34653) Co-authored-by: Laura Coursen --- ...ching-the-audit-log-for-your-enterprise.md | 53 ++++++++++++------- .../best-practices-for-enterprises.md | 4 ++ ...ompliance-reports-for-your-organization.md | 1 + .../ent-ownership-recommendation.md | 1 + 4 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 data/reusables/organizations/ent-ownership-recommendation.md diff --git a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise.md b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise.md index 28a810e961ba..f4f50b07e5d1 100644 --- a/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise.md +++ b/content/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/searching-the-audit-log-for-your-enterprise.md @@ -62,26 +62,41 @@ You can compose a search query from one or more `key:value` pairs, separated by The `key:value` pairs that can be used in a search query are: Key | Value ---------------:| -------------------------------------------------------- -`actor_id` | ID of the user account that initiated the action -`actor` | Name of the user account that initiated the action -`oauth_app_id` | ID of the OAuth application associated with the action -`action` | Name of the audited action -`user_id` | ID of the user affected by the action -`user` | Name of the user affected by the action -`repo_id` | ID of the repository affected by the action (if applicable) -`repo` | Name of the repository affected by the action (if applicable) -`actor_ip` | IP address from which the action was initiated -`created` | Time at which the action occurred{% ifversion ghes %}. If querying the audit log from the site admin dashboard, use `created_at` instead{% endif %} -`from` | View from which the action was initiated -`note` | Miscellaneous event-specific information (in either plain text or JSON format) -`org` | Name of the organization affected by the action (if applicable) -`org_id` | ID of the organization affected by the action (if applicable) -`business` | Name of the enterprise affected by the action (if applicable) -`business_id` | ID of the enterprise affected by the action (if applicable) +-------------- | -------------------------------------------------------- +`action` | Name of the audited action. +`actor` | Name of the user account that initiated the action. +{%- ifversion ghes or ghae %} +`actor_id` | ID of the user account that initiated the action.{% endif %} +{%- ifversion ghes or ghae %} +`actor_ip` | IP address from which the action was initiated.{% endif %} +{%- ifversion ghes or ghae %} +`business` | Name of the enterprise affected by the action (if applicable).{% endif %} +{%- ifversion ghes or ghae %} +`business_id` | ID of the enterprise affected by the action (if applicable).{% endif %} {%- ifversion token-audit-log %} -`hashed_token` | The token used to authenticate for the action (if applicable, see "[AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/identifying-audit-log-events-performed-by-an-access-token)") -{%- endif %} +`created` | Time at which the action occurred.{% ifversion ghes %} If querying the audit log from the site admin dashboard, use `created_at` instead.{% endif %} +`country` | Name of the country where the actor was when performing the action. +`country_code` | Two-letter short code of the country where the actor was when performing the action. +{%- ifversion ghes or ghae %} +`from` | View from which the action was initiated.{% endif %} +`hashed_token` | The token used to authenticate for the action (if applicable, see "[Identifying audit log events performed by an access token](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/identifying-audit-log-events-performed-by-an-access-token)"). {% endif %} +`ip` | IP address of the actor. +{%- ifversion ghes or ghae %} +`note` | Miscellaneous event-specific information (in either plain text or JSON format).{% endif %} +{%- ifversion ghes or ghae %} +`oauth_app_id` | ID of the OAuth application associated with the action.{% endif %} +`operation` | Operation type that corresponds with the action. Operation types are `create`, `access`, `modify`, `remove`, `authentication`, `transfer`, and `restore`. +{%- ifversion ghes or ghae %} +`org` | Name of the organization affected by the action (if applicable).{% endif %} +{%- ifversion ghes or ghae %} +`org_id` | ID of the organization affected by the action (if applicable).{% endif %} +{%- ifversion ghes or ghae %} +`repo_id` | ID of the repository affected by the action (if applicable).{% endif %} +`repository` | Name with owner of the repository where the action occurred (such as `octocat/octo-repo`). +{%- ifversion ghes or ghae %} +`user_id` | ID of the user affected by the action.{% endif %} +`user` | Name of the user affected by the action. + To see actions grouped by category, you can also use the action qualifier as a `key:value` pair. For more information, see "[Search based on the action performed](#search-based-on-the-action-performed)." diff --git a/content/admin/overview/best-practices-for-enterprises.md b/content/admin/overview/best-practices-for-enterprises.md index 06c5ce37e674..0abe8c2a7c42 100644 --- a/content/admin/overview/best-practices-for-enterprises.md +++ b/content/admin/overview/best-practices-for-enterprises.md @@ -13,6 +13,10 @@ topics: - Fundamentals --- +## Assign multiple owners + +{% data reusables.organizations.ent-ownership-recommendation %} {% ifversion ghec or ghes %}For more information, see "[Inviting people to manage your enterprise](/admin/user-management/managing-users-in-your-enterprise/inviting-people-to-manage-your-enterprise)."{% endif %} + {% ifversion ghec %} ## Identify the best authentication method for your enterprise diff --git a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/accessing-compliance-reports-for-your-organization.md b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/accessing-compliance-reports-for-your-organization.md index e350dff9dd2c..3c2a4096ee66 100644 --- a/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/accessing-compliance-reports-for-your-organization.md +++ b/content/organizations/keeping-your-organization-secure/managing-security-settings-for-your-organization/accessing-compliance-reports-for-your-organization.md @@ -23,6 +23,7 @@ You can access {% data variables.product.company_short %}'s compliance reports i **Note:** To view compliance reports, your organization must use {% data variables.product.prodname_ghe_cloud %}. {% data reusables.enterprise.link-to-ghec-trial %} +If you are not using {% data variables.product.prodname_ghe_cloud %}, you can find similar reports at [GitHub Security](https://www.github.com/security). {% endnote %} {% data reusables.profile.access_org %} diff --git a/data/reusables/organizations/ent-ownership-recommendation.md b/data/reusables/organizations/ent-ownership-recommendation.md new file mode 100644 index 000000000000..436a04770aed --- /dev/null +++ b/data/reusables/organizations/ent-ownership-recommendation.md @@ -0,0 +1 @@ +If an enterprise only has one owner, the enterprise's resources can become inaccessible if the owner is unreachable. To protect access to your resources, we recommend that at least two people within the enterprise have the owner role. From 1daed5cad88385210206a713962d341170c32a98 Mon Sep 17 00:00:00 2001 From: Emma Gabriel Date: Fri, 3 Mar 2023 01:07:56 +0000 Subject: [PATCH 3/3] Adopt Microsoft approved language (#35263) --- .../customizing-your-profile/personalizing-your-profile.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md b/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md index 20fb8ba7488a..37f3b27d06b1 100644 --- a/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md +++ b/content/account-and-profile/setting-up-and-managing-your-github-profile/customizing-your-profile/personalizing-your-profile.md @@ -103,7 +103,7 @@ Add pronouns to your public user profile to share information about yourself wit {% note %} **Note:** - Your pronouns will be visible to {% data variables.product.product_name %} users, including in regions where local laws restrict using pronouns other than those assigned at birth. + Your pronouns will be visible to {% data variables.product.product_name %} users. It is important to consider that for transgender and non-binary people, covering demands in the workplace, at school, or in other contexts, may make it more comfortable not to share their pronouns. Please be aware of any applicable local laws, regulations, or cultural norms that may pose additional risks to transgender or non-binary people as you consider whether to leverage the pronouns feature. {% endnote %}