diff --git a/content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization.md b/content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization.md index d8f7497dfd01..82a9d202895c 100644 --- a/content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization.md +++ b/content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization.md @@ -74,7 +74,7 @@ You must be an organization owner or moderator to block a user from a repository {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.block_users %} -1. Under "Block a user", in the text field, type the username of the user you'd like to block. +1. Under "Block a user", search for the user by username, full name, or email address, then select the user. 1. If you'd like to set a time limit for the block, next to the text field, select the **Block options** dropdown menu, and click the amount of time you'd like to block the user. {% data reusables.organizations.close-all-content-when-blocking-user %} 1. Click **Block user**. diff --git a/content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-personal-account.md b/content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-personal-account.md index c3554e3acac6..b3e3dc2059ca 100644 --- a/content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-personal-account.md +++ b/content/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-personal-account.md @@ -73,9 +73,7 @@ You must own the repository to block a user from its content. {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.blocked_users %} -1. Under "Block a user", type the username of the user you'd like to block. -{% data reusables.organizations.close-all-content-when-blocking-user %} -1. Click **Block user**. +1. Under "Block a user", search for the user by username, full name, or email address, then select the user and click **Block user**. 1. Optionally, to add a note to describe why a user was blocked, click **Add Note**. The note will only be visible to you. 1. Optionally, you can display a warning when you visit a repository where a blocked user is a contributor. Under "Blocked users", select **Warn me when a blocked user is a prior contributor to a repository**. diff --git a/content/communities/maintaining-your-safety-on-github/viewing-users-who-are-blocked-from-your-organization.md b/content/communities/maintaining-your-safety-on-github/viewing-users-who-are-blocked-from-your-organization.md index e2ef7e42af8f..10f6f3bb2705 100644 --- a/content/communities/maintaining-your-safety-on-github/viewing-users-who-are-blocked-from-your-organization.md +++ b/content/communities/maintaining-your-safety-on-github/viewing-users-who-are-blocked-from-your-organization.md @@ -1,6 +1,6 @@ --- title: Viewing users who are blocked from your organization -intro: 'You can view a list of all users whom you or other owners have blocked from your organization. If a user was blocked for a specific amount of time, you can see the amount of time they were blocked for.' +intro: 'You can find and review users who are blocked from your organization, including details about why, when, and by whom.' redirect_from: - /articles/viewing-users-who-are-blocked-from-your-organization - /github/building-a-strong-community/viewing-users-who-are-blocked-from-your-organization @@ -16,8 +16,10 @@ category: {% data reusables.profile.access_org %} {% data reusables.profile.org_settings %} {% data reusables.organizations.block_users %} -1. Under "Blocked users", review the list of users who are blocked from your organization. -1. Optionally, to close all open issues, pull requests, and discussions a blocked user has opened in repositories owned by the organization, next to the user, click {% octicon "kebab-horizontal" aria-label="Show options" %}, then click **Close all content**. If you are an organization moderator, only content in repositories where you have write access will be closed. +1. To find a blocked user, search by username, full name, or email address. You can also sort the list or filter it by block reason. +1. Review the details for a blocked user, including any private note, who applied the block, and the expiration date, if applicable. +1. Optionally, edit the block settings or private note. +1. Optionally, to close all open issues, pull requests, and discussions a blocked user has opened in repositories across your organization, next to the user, click {% octicon "kebab-horizontal" aria-label="Show options" %}, then click **Close all content**. ## Further reading diff --git a/content/communities/maintaining-your-safety-on-github/viewing-users-youve-blocked-from-your-personal-account.md b/content/communities/maintaining-your-safety-on-github/viewing-users-youve-blocked-from-your-personal-account.md index 168f03b71a04..276ccb02d21b 100644 --- a/content/communities/maintaining-your-safety-on-github/viewing-users-youve-blocked-from-your-personal-account.md +++ b/content/communities/maintaining-your-safety-on-github/viewing-users-youve-blocked-from-your-personal-account.md @@ -1,6 +1,6 @@ --- title: Viewing users you've blocked from your personal account -intro: You can view a list of all users you've blocked from your personal account. +intro: You can find and review users you've blocked from your personal account, including private notes about why you blocked them. redirect_from: - /articles/viewing-users-you-ve-blocked-from-your-personal-account - /articles/viewing-users-youve-blocked-from-your-personal-account @@ -15,8 +15,11 @@ category: {% data reusables.user-settings.access_settings %} {% data reusables.user-settings.blocked_users %} -1. Under "Blocked users", review the list of users you've blocked from your account. -1. Optionally, to close all open issues, pull requests, and discussions a blocked user has opened in repositories you own, next to the user, click {% octicon "kebab-horizontal" aria-label="Show options" %}, then click **Close all content**. +1. To find a blocked user, search by username, full name, or email address. You can also sort the list or filter it by block reason. +1. Review the details for a blocked user, including any private note you've added. +1. Optionally, edit the block settings or private note. +1. Optionally, to close all open issues, pull requests, and discussions a blocked user has opened in repositories, next to the user, click {% octicon "kebab-horizontal" aria-label="Show options" %}, then click **Close all content**. + ## Further reading diff --git a/content/copilot/reference/enterprise-administrators/enterprise-managed-settings.md b/content/copilot/reference/enterprise-administrators/enterprise-managed-settings.md index 08be02c92e64..2d280caf154f 100644 --- a/content/copilot/reference/enterprise-administrators/enterprise-managed-settings.md +++ b/content/copilot/reference/enterprise-administrators/enterprise-managed-settings.md @@ -38,7 +38,7 @@ As an exception, the following keys are composed in the most restrictive directi | `permissions.deny` | Blocks specific operations | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | | `permissions.ask` | Requires a fresh human approval before specific operations can proceed | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | | `permissions.allow` | Permits specific operations to proceed without a prompt | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} | -| `model` | Sets auto model selection as the default for new conversations | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | +| `model` | Sets your preferred model as the default for new conversations | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "x" aria-label="Not supported" %} | | `enabledPlugins` | Enables or disables specific plugins by key | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | | `extraKnownMarketplaces` | Adds plugin marketplaces that users can access | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | | `strictKnownMarketplaces` | Restricts plugin installation to explicitly listed marketplaces | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} | @@ -179,10 +179,11 @@ Restricts plugin installation to only the marketplaces explicitly defined by the ## model -Sets auto model selection as the default for new conversations. See [AUTOTITLE](/copilot/concepts/models/auto-model-selection). +Sets your preferred model as the default for new conversations. This lets you choose the default model that best fits your enterprise's workflows. Users can still select a different model on a per-conversation basis. +* Set `model` to `"auto"` to use {% data variables.copilot.copilot_auto_model_selection_short %} as the default, so new sessions choose a model automatically unless the user specifies a different model on a per-conversation basis. See [AUTOTITLE](/copilot/concepts/models/auto-model-selection). +* Set `model` to a specific model and version to make that model the default for new conversations, for example `"kimi-k-3"`. -* When you set `model` to `"auto"`, new sessions use Auto model unless the user specifies a different model on a per-conversation basis. -* This key is overridable by enterprise team mapping. In your `{% data variables.copilot.managed_setting_file %}`, use the `{ "overridable": "auto" }` syntax to specialize the key's configuration on a per-team basis. You can then set `"model": "unmanaged"` in a team settings file, providing a specialization that takes precedence over `{% data variables.copilot.managed_setting_file %}` for members of the subject team. +This key is overridable by enterprise team mapping. In your `{% data variables.copilot.managed_setting_file %}`, use the `{ "overridable": "auto" }` syntax to specialize the key's configuration on a per-team basis. You can then set `"model": "unmanaged"` in a team settings file, providing a specialization that takes precedence over `{% data variables.copilot.managed_setting_file %}` for members of the subject team. > [!NOTE] > `model` was originally documented as `permissions.model`. Clients still read the nested `permissions.model` value when the top-level `model` key is absent, but you should use the top-level `model` key in new configurations.