From 97a79cab8494fc79614505ead02526740a52aa6f Mon Sep 17 00:00:00 2001
From: Sophie <29382425+sophietheking@users.noreply.github.com>
Date: Mon, 14 Nov 2022 23:06:41 +0100
Subject: [PATCH] [2022-11-14]: Option to hide user's existing comments when
 blocking from org via Discussions - [GA]  (#32479)

Co-authored-by: Anne-Marie  <102995847+am-stead@users.noreply.github.com>
---
 .../blocking-a-user-from-your-organization.md             | 2 +-
 .../moderating-discussions.md                             | 8 ++++++++
 data/features/discussions-hide-comments-on-block.yml      | 5 +++++
 data/reusables/organizations/blocking-a-user.md           | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 data/features/discussions-hide-comments-on-block.yml
 create mode 100644 data/reusables/organizations/blocking-a-user.md

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 49893e05c7..0c62ef4329 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
@@ -14,7 +14,7 @@ shortTitle: Block from your org
 
 You can block non-members from within your organization's settings or from a specific comment made by a user. When you block a user in a comment, you can choose to send the user a notification explaining that they were blocked and why. Otherwise, the user is not directly notified that you've blocked them. Blocked users can still delete their existing content.
 
-When you block a user, you can choose to block them indefinitely or for a specific amount of time. If you block someone for a specific amount of time, they are automatically unblocked after the chosen time expires. If you block someone indefinitely, you can unblock them manually at any time. For more information, see "[Unblocking a user from your organization](/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization)."
+{% data reusables.organizations.blocking-a-user %}
 
 {% tip %}
 
diff --git a/content/discussions/managing-discussions-for-your-community/moderating-discussions.md b/content/discussions/managing-discussions-for-your-community/moderating-discussions.md
index a8d7baa693..9f154541c3 100644
--- a/content/discussions/managing-discussions-for-your-community/moderating-discussions.md
+++ b/content/discussions/managing-discussions-for-your-community/moderating-discussions.md
@@ -37,3 +37,11 @@ When you convert an issue to a discussion, the discussion is automatically creat
 1. In the right margin of an issue, click **Convert to discussion**.
 1. Select the **Choose a category** drop-down menu, and click a category for your discussion.
 1. Click **I understand, convert this issue to a discussion**.
+
+{% ifversion discussions-hide-comments-on-block %}
+## Blocking a user from your organization
+
+Organization owners and moderators can block a user from the organization if their comments don't align with the community's code of conduct. When you block a user, they will no longer be able to comment on discussions. You can also hide all of the comments a user has made in the organization. For more information, see "[Blocking a user from your organization](/communities/maintaining-your-safety-on-github/blocking-a-user-from-your-organization)."
+
+{% data reusables.organizations.blocking-a-user %} 
+{% endif %}
diff --git a/data/features/discussions-hide-comments-on-block.yml b/data/features/discussions-hide-comments-on-block.yml
new file mode 100644
index 0000000000..ec75f7bad2
--- /dev/null
+++ b/data/features/discussions-hide-comments-on-block.yml
@@ -0,0 +1,5 @@
+# Issue 8445
+# Option to hide user's existing comments when blocking from org via Discussions
+versions:
+  fpt: '*'
+  ghec: '*'
diff --git a/data/reusables/organizations/blocking-a-user.md b/data/reusables/organizations/blocking-a-user.md
new file mode 100644
index 0000000000..ba513da748
--- /dev/null
+++ b/data/reusables/organizations/blocking-a-user.md
@@ -0,0 +1 @@
+When you block a user, you can choose to block them indefinitely or for a specific amount of time. If you block someone for a specific amount of time, they are automatically unblocked after the chosen time expires. If you block someone indefinitely, you can unblock them manually at any time. For more information, see "[Unblocking a user from your organization](/communities/maintaining-your-safety-on-github/unblocking-a-user-from-your-organization)."
\ No newline at end of file