Skip to content

Commit 8afa01a

Browse files
authored
Branch was updated using the 'autoupdate branch' Actions workflow.
2 parents 5e176d5 + 519973b commit 8afa01a

2 files changed

Lines changed: 3 additions & 6 deletions

File tree

content/github/building-a-strong-community/blocking-a-user-from-your-organization.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@ When you block a user, you can choose to block them indefinitely or for a specif
1313

1414
{% tip %}
1515

16-
**Tip:** If you're blocking a user because of a heated conversation, consider [locking the conversation](/articles/locking-conversations) so only collaborators can comment.
16+
**Tip:** If you're blocking a user because of a heated conversation, consider locking the conversation so only collaborators can comment. For more information, see "[Locking conversations](/github/building-a-strong-community/locking-conversations)."
1717

1818
{% endtip %}
1919

2020
At the time that you block a user from your organization:
2121
- The user stops watching your organization's repositories
2222
- The user's stars and issue assignments are removed from your repositories
23-
- The user's forks of your organization's repositories are deleted
2423
- The user's votes on discussions or comments in your organization's repositories are deleted
2524
- The user is removed as a collaborator on your organization's repositories
2625
- The user's contributions to your organization's repositories are no longer counted as contributions for them

content/github/building-a-strong-community/blocking-a-user-from-your-personal-account.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ versions:
99

1010
### About blocking users
1111

12-
You can block a user in your account settings or from the user's profile. {% data variables.product.prodname_dotcom %} will not notify the user when you block them. If you want to avoid contributing to the same project as someone you've blocked, you can [choose to display a warning](/articles/blocking-a-user-from-your-personal-account/#blocking-a-user-in-your-account-settings) on any repositories with prior contributions from a blocked user. You may still see the activity of blocked users in shared spaces and blocked users can delete their existing content.
12+
You can block a user in your account settings or from the user's profile. {% data variables.product.prodname_dotcom %} will not notify the user when you block them. If you want to avoid contributing to the same project as someone you've blocked, you can choose to display a warning on any repositories with prior contributions from a blocked user. For more information, see "[Blocking a user in your account settings](#blocking-a-user-in-your-account-settings)." You may still see the activity of blocked users in shared spaces and blocked users can delete their existing content.
1313

1414
{% tip %}
1515

16-
**Tip:** If you're blocking a user because of a heated conversation, consider [locking the conversation](/articles/locking-conversations) so only collaborators can comment.
16+
**Tip:** If you're blocking a user because of a heated conversation, consider locking the conversation so only collaborators can comment. For more information, see "[Locking conversations](/github/building-a-strong-community/locking-conversations)."
1717

1818
{% endtip %}
1919

@@ -22,8 +22,6 @@ When you block a user:
2222
- The user stops watching and unpins your repositories
2323
- The user is not able to join any organizations you are an owner of
2424
- The user's stars and issue assignments are removed from your repositories
25-
- The user's forks of your repositories are deleted
26-
- You delete any forks of the user's repositories
2725
- The user's votes on discussions or comments in your repositories are deleted
2826
- The user is removed as a collaborator on your repositories
2927
- The user's contributions to your repositories are no longer counted as contributions for them

0 commit comments

Comments
 (0)