From ccbebea3d92dfb907c85b7d32a87dd531eb1ab26 Mon Sep 17 00:00:00 2001 From: Robert Sese <734194+rsese@users.noreply.github.com> Date: Tue, 12 Aug 2025 13:44:41 -0500 Subject: [PATCH 1/2] add client_name param for proxy search (#57094) --- src/search/middleware/general-search-middleware.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/search/middleware/general-search-middleware.ts b/src/search/middleware/general-search-middleware.ts index f96567f906a0..3eda5b6cebbc 100644 --- a/src/search/middleware/general-search-middleware.ts +++ b/src/search/middleware/general-search-middleware.ts @@ -169,6 +169,8 @@ async function getProxySearch( url.searchParams.set(key, value) } } + // Add client_name for external API requests + url.searchParams.set('client_name', 'docs.github.com-client') console.log(`Proxying search to ${url}`) return got(url).json() } From e739fc93cfeb77ce3be8a60c5c46b5dbafb21dc0 Mon Sep 17 00:00:00 2001 From: Sam Browning <106113886+sabrowning1@users.noreply.github.com> Date: Tue, 12 Aug 2025 14:47:19 -0400 Subject: [PATCH 2/2] EDI-ify "Managing your membership in organizations" (#57080) Co-authored-by: Evan Bonsignori --- content/account-and-profile/concepts/index.md | 1 + .../concepts/scheduled-reminders.md | 21 +++++++++++ .../accessing-an-organization.md | 1 + .../managing-your-scheduled-reminders.md | 14 ------- ...izing-or-hiding-organization-membership.md | 2 - ...ng-organization-approval-for-oauth-apps.md | 9 +++-- ...iewing-peoples-roles-in-an-organization.md | 37 ++++++++----------- .../account-and-profile/reference/index.md | 1 - ...n-organization-owned-by-your-enterprise.md | 6 ++- 9 files changed, 48 insertions(+), 44 deletions(-) create mode 100644 content/account-and-profile/concepts/scheduled-reminders.md diff --git a/content/account-and-profile/concepts/index.md b/content/account-and-profile/concepts/index.md index ed437d758227..19a7f186e1cc 100644 --- a/content/account-and-profile/concepts/index.md +++ b/content/account-and-profile/concepts/index.md @@ -15,4 +15,5 @@ children: - /about-your-organizations-profile - /about-organization-membership - /changing-your-github-username + - /scheduled-reminders --- diff --git a/content/account-and-profile/concepts/scheduled-reminders.md b/content/account-and-profile/concepts/scheduled-reminders.md new file mode 100644 index 000000000000..fd406dd1d571 --- /dev/null +++ b/content/account-and-profile/concepts/scheduled-reminders.md @@ -0,0 +1,21 @@ +--- +title: Scheduled reminders +intro: 'You can set scheduled reminders for requested reviews on pull requests in your organization.' +versions: + fpt: '*' + ghec: '*' +topics: + - Accounts +--- + +Scheduled reminders are used to make sure that users focus on the most important review requests that require their attention. Scheduled reminders for pull requests will send a message to you in Slack with open pull requests needing your review at a specified time. For example, you can setup scheduled reminders to send you a message in Slack every morning at 10 AM with pull requests needing to be reviewed by you or one of your teams. + +For certain events, you can also enable real-time alerts for scheduled reminders. Real-time alerts get sent to your Slack channel as soon as an important event, such as when you are assigned a review, is triggered by another user. + +You can set scheduled reminders for personal or team-level review requests for pull requests in organizations you are a member of. Before you can create a scheduled reminder for yourself, an organization owner must authorize your Slack workspace. For more information, see [AUTOTITLE](/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization). + +{% data reusables.reminders.scheduled-reminders-limitations %} + +## Next steps + +To learn how to set up and control scheduled reminders, see [AUTOTITLE](/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/managing-your-scheduled-reminders). diff --git a/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/accessing-an-organization.md b/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/accessing-an-organization.md index 2e8ee5e1a18d..74113c9cd90d 100644 --- a/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/accessing-an-organization.md +++ b/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/accessing-an-organization.md @@ -1,5 +1,6 @@ --- title: Accessing an organization +shortTitle: Access an organization intro: 'To access an organization that you''re a member of, you must sign in to your personal account.' redirect_from: - /articles/error-cannot-log-in-that-account-is-an-organization diff --git a/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/managing-your-scheduled-reminders.md b/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/managing-your-scheduled-reminders.md index 0e10db06c91c..4fe5381a069e 100644 --- a/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/managing-your-scheduled-reminders.md +++ b/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/managing-your-scheduled-reminders.md @@ -13,15 +13,6 @@ redirect_from: - /account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/managing-your-scheduled-reminders shortTitle: Manage scheduled reminders --- -## About scheduled reminders for users - -Scheduled reminders are used to make sure that users focus on the most important review requests that require their attention. Scheduled reminders for pull requests will send a message to you in Slack with open pull requests needing your review at a specified time. For example, you can setup scheduled reminders to send you a message in Slack every morning at 10 AM with pull requests needing to be reviewed by you or one of your teams. - -For certain events, you can also enable real-time alerts for scheduled reminders. Real-time alerts get sent to your Slack channel as soon as an important event, such as when you are assigned a review, is triggered by another user. - -You can set scheduled reminders for personal or team-level review requests for pull requests in organizations you are a member of. Before you can create a scheduled reminder for yourself, an organization owner must authorize your Slack workspace. For more information, see [AUTOTITLE](/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization). - -{% data reusables.reminders.scheduled-reminders-limitations %} ## Creating scheduled reminders for your personal account @@ -61,8 +52,3 @@ You can set scheduled reminders for personal or team-level review requests for p ![Screenshot of the settings for a personal account showing the name of a GitHub organization. An edit button with a pencil icon is outlined in orange.](/assets/images/help/settings/scheduled-reminders-org-choice.png) {% data reusables.reminders.delete %} - -## Further reading - -* [AUTOTITLE](/organizations/managing-organization-settings/managing-scheduled-reminders-for-your-organization) -* [AUTOTITLE](/organizations/organizing-members-into-teams/managing-scheduled-reminders-for-your-team) diff --git a/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/publicizing-or-hiding-organization-membership.md b/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/publicizing-or-hiding-organization-membership.md index 79f9552fa50b..1002556396a5 100644 --- a/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/publicizing-or-hiding-organization-membership.md +++ b/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/publicizing-or-hiding-organization-membership.md @@ -17,8 +17,6 @@ topics: shortTitle: Show or hide membership --- -## Changing the visibility of your organization membership - {% data reusables.profile.access_org %} {% data reusables.user-settings.access_org %} {% data reusables.organizations.people %} diff --git a/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/requesting-organization-approval-for-oauth-apps.md b/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/requesting-organization-approval-for-oauth-apps.md index a24efd0655d8..65908a5a28bc 100644 --- a/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/requesting-organization-approval-for-oauth-apps.md +++ b/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/requesting-organization-approval-for-oauth-apps.md @@ -1,6 +1,6 @@ --- title: Requesting organization approval for OAuth apps -intro: 'Organization members and outside collaborators can request that an owner approve access to organization resources for {% data variables.product.prodname_oauth_apps %}.' +intro: 'You can request approval for {% data variables.product.prodname_oauth_apps %} to access organization resources.' redirect_from: - /articles/requesting-organization-approval-for-third-party-applications - /articles/requesting-organization-approval-for-your-authorized-applications @@ -14,14 +14,15 @@ versions: ghec: '*' topics: - Accounts +permissions: Organization members can request owner approval for {% data variables.product.prodname_oauth_apps %}. Outside collaborators can request owner approval for {% data variables.product.prodname_oauth_apps %} if integration access requests are enabled. For more information, see [AUTOTITLE](/organizations/managing-programmatic-access-to-your-organization/limiting-oauth-app-and-github-app-access-requests). shortTitle: 'Request {% data variables.product.prodname_oauth_app %} approval' --- -## About requesting organization approval for an {% data variables.product.prodname_oauth_app %} +## Prerequisites -Organization members can always request owner approval for {% data variables.product.prodname_oauth_apps %} they'd like to use, and organization owners receive a notification of pending requests. Outside collaborators can request owner approval for {% data variables.product.prodname_oauth_apps %} they'd like to use if integration access requests are enabled. For more information, see [AUTOTITLE](/organizations/managing-programmatic-access-to-your-organization/limiting-oauth-app-and-github-app-access-requests). +Before you can request organization approval for an {% data variables.product.prodname_oauth_app %}, you need to authorize it for your personal account. See [AUTOTITLE](/apps/oauth-apps/using-oauth-apps/installing-an-oauth-app-in-your-personal-account#installing-an-oauth-app-in-your-personal-account). -## Requesting organization approval for an {% data variables.product.prodname_oauth_app %} you've already authorized for your personal account +## Requesting organization approval for an {% data variables.product.prodname_oauth_app %} {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.access_applications %} diff --git a/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization.md b/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization.md index d9d1a979c6d4..aa3ddf96c58d 100644 --- a/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization.md +++ b/content/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/viewing-peoples-roles-in-an-organization.md @@ -1,7 +1,7 @@ --- title: Viewing people's roles in an organization -intro: 'You can view a list of the people in your organization and filter by their role. For more information on organization roles, see [Roles in an organization](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization).' -permissions: Organization members can see people's roles in the organization. +intro: 'You can view a list of the people in your organization and filter by their role.' +permissions: Organization members redirect_from: - /articles/viewing-people-s-roles-in-an-organization - /articles/viewing-peoples-roles-in-an-organization @@ -15,10 +15,14 @@ versions: ghec: '*' topics: - Accounts -shortTitle: View people in an organization +shortTitle: View organization members --- -## View organization roles +{% ifversion ghes or ghec %} + +## Viewing organization roles + +{% endif %} {% data reusables.profile.access_org %} {% data reusables.user-settings.access_org %} @@ -33,28 +37,17 @@ If your organization uses {% data variables.product.prodname_ghe_cloud %}, you c {% else %} -## View enterprise owners and their roles in an organization - -If your organization is managed by an enterprise account, then you can view the enterprise owners who manage billing settings and policies for all of your enterprise's organizations. For more information about enterprise accounts, see [AUTOTITLE](/get-started/learning-about-github/types-of-github-accounts). - -You can also view whether an enterprise owner has a specific role in the organization. Enterprise owners can also be an organization member, any other organization role, or be un-affiliated with the organization. - -> [!NOTE] -> If you're an organization owner, you can also invite an enterprise owner to have a role in the organization. If an enterprise owner accepts the invitation, a {% ifversion enterprise-licensing-language %}{% else %}seat or{% endif %} license in the organization is used from the available licenses for your enterprise. For more information about how licensing works, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner). - -| **Enterprise role** | **Organization role** | **Organization access or impact** | -|----|----|----| -| Enterprise owner | Un-affiliated or no official organization role | Cannot access organization content or repositories but manages enterprise settings and policies that impact your organization. | -| Enterprise owner | Organization owner | Able to configure organization settings and manage access to the organization's resources through teams, etc. | -| Enterprise owner | Organization member | Able to access organization resources and content, such as repositories, without access to the organization's settings. | - -To review all roles in an organization, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization). An organization member can also have a custom role for a specific repository. For more information, see [AUTOTITLE](/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/managing-custom-repository-roles-for-an-organization). - -For more information about the enterprise owner role, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-users-in-your-enterprise/roles-in-an-enterprise#enterprise-owner). +## Viewing enterprise owners and their roles in an organization {% data reusables.profile.access_org %} {% data reusables.user-settings.access_org %} {% data reusables.organizations.people %} 1. In the left sidebar, under "Enterprise permissions", click **Enterprise owners**. + Depending on their organization role, enterprise owners have different levels of access to organization resources. For more information, see [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise). + {% endif %} + +## Next steps + +To learn more about organization roles, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization). diff --git a/content/account-and-profile/reference/index.md b/content/account-and-profile/reference/index.md index bddce6c461df..cec718dd581f 100644 --- a/content/account-and-profile/reference/index.md +++ b/content/account-and-profile/reference/index.md @@ -12,4 +12,3 @@ children: - /types-of-emails-github-sends - /why-are-my-contributions-not-showing-up-on-my-profile --- - diff --git a/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md index be9d70138f19..338696ad9644 100644 --- a/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md +++ b/content/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/managing-your-role-in-an-organization-owned-by-your-enterprise.md @@ -17,7 +17,11 @@ shortTitle: Manage your organization roles ## About role management -You can choose to join an organization owned by your enterprise as a member or as an organization owner, change your role within the organization, or leave the organization. +You can choose to join an organization owned by your enterprise as a member or as an organization owner, change your role within the organization, or leave the organization. Your organization role determines your level of access to organization resources as follows: + +* **Unaffiliated or no official organization role:** you cannot access organization content or repositories, but you can manage enterprise settings and policies that impact your organization +* **Organization member:** you can access organization resources and content, such as repositories, but you cannot access the organization's settings +* **Organization owner:** you can configure organization settings and manage access to the organization's resources through teams, etc. {% ifversion ghec %}