diff --git a/assets/images/help/discussions/report-discussion.png b/assets/images/help/discussions/report-discussion.png new file mode 100644 index 0000000000..cad75c803b Binary files /dev/null and b/assets/images/help/discussions/report-discussion.png differ diff --git a/content/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam.md b/content/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam.md index f171411638..e6c66494cf 100644 --- a/content/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam.md +++ b/content/communities/maintaining-your-safety-on-github/reporting-abuse-or-spam.md @@ -1,7 +1,7 @@ --- title: Reporting abuse or spam intro: You can report behavior and content that violates community guidelines and terms. -permissions: 'Owners, collaborators, prior contributors, and people with write access can report issues, pull requests, and comments on issues, pull requests, and commits. Anyone can report apps in {% data variables.product.prodname_marketplace %}.' +permissions: 'Owners, collaborators, prior contributors, and people with write access can report issues, pull requests, discussions, and comments on issues, pull requests, discussions, and commits. Anyone can report apps in {% data variables.product.prodname_marketplace %}.' redirect_from: - /articles/reporting-abuse-or-spam - /github/building-a-strong-community/reporting-abuse-or-spam @@ -37,6 +37,15 @@ Users in India can contact GitHub's Grievance Officer for India [here](https://s ![Screenshot of an issue description. In the header, a kebab icon is outlined in dark orange.](/assets/images/help/repository/menu-report-issue-or-pr.png) {% data reusables.community.report-content %} +## Reporting a discussion + +1. Navigate to the discussion you'd like to report. +1. In the upper-right corner of the discussion, click {% octicon "kebab-horizontal" aria-label="The horizontal kebab octicon" %}, then click **Report content**. + + ![Screenshot of a discussion. The option to report content in the kebab menu is outlined with dark orange.](/assets/images/help/discussions/report-discussion.png) + +1. Select an email address and a category, then click **Send request**. + ## Reporting a comment 1. Navigate to the comment you'd like to report. diff --git a/content/communities/moderating-comments-and-conversations/managing-how-contributors-report-abuse-in-your-organizations-repository.md b/content/communities/moderating-comments-and-conversations/managing-how-contributors-report-abuse-in-your-organizations-repository.md index 3f87096416..71232bc079 100644 --- a/content/communities/moderating-comments-and-conversations/managing-how-contributors-report-abuse-in-your-organizations-repository.md +++ b/content/communities/moderating-comments-and-conversations/managing-how-contributors-report-abuse-in-your-organizations-repository.md @@ -1,6 +1,7 @@ --- title: Managing how contributors report abuse in your organization's repository intro: You can allow contributors to report disruptive behavior directly to repository maintainers. +permissions: Anyone with admin permissions to a repository can manage how contributors report abuse in the repository. versions: fpt: '*' ghec: '*' @@ -11,14 +12,15 @@ topics: shortTitle: Manage abuse in your org --- -Anyone with admin permissions to a repository can manage how contributors report abuse in the repository. - You can enable or disable reported content for public repositories owned by an organization. {% data reusables.repositories.navigate-to-repo %} {% data reusables.repositories.sidebar-settings %} {% data reusables.repositories.sidebar-moderation-reported-content %} -4. Under "Reported content", select or deselect **Accept content reports from collaborators and prior contributors**. +1. Under "Reported content", select a reporting permissions setting, then click **Save**. + + - **Prior contributors and collaborators** will be selected by default for repositories created after March 3, 2023. + ## Further reading diff --git a/content/discussions/managing-discussions-for-your-community/managing-discussions.md b/content/discussions/managing-discussions-for-your-community/managing-discussions.md index 2a253b0ec8..3fb0068fb9 100644 --- a/content/discussions/managing-discussions-for-your-community/managing-discussions.md +++ b/content/discussions/managing-discussions-for-your-community/managing-discussions.md @@ -1,7 +1,7 @@ --- title: Managing discussions intro: 'You can categorize, spotlight, transfer, or delete the discussions.' -permissions: Repository administrators and people with write or greater access to a repository can manage discussions in the repository. Repository administrators and people with write or greater access to the source repository for organization discussions can manage discussions in the organization. +permissions: Repository administrators and people with {% ifversion discussions-moderators-control-who-can-report %}triage{% else %}write{% endif %} or greater access to a repository can manage discussions in the repository. Repository administrators and people with {% ifversion discussions-moderators-control-who-can-report %}triage{% else %}write{% endif %} or greater access to the source repository for organization discussions can manage discussions in the organization. versions: feature: discussions shortTitle: Manage discussions @@ -147,7 +147,6 @@ To transfer a discussion, you must have permissions to create discussions in the ![Screenshot of the right sidebar of a discussion. The "Transfer this discussion" option is outlined in dark orange.](/assets/images/help/discussions/transfer-discussion-with-category-pin.png) {% else %} - ![Screenshot of the right sidebar of a discussion. The "Transfer this discussion" option is outlined in dark orange.](/assets/images/help/discussions/click-transfer-discussion.png){% endif %} 1. Select the repository you want to transfer the discussion to. You can also search for repositories. If you want to transfer a discussion to an organization, choose the source repository for the organization's discussions. diff --git a/content/organizations/managing-user-access-to-your-organizations-repositories/repository-roles-for-an-organization.md b/content/organizations/managing-user-access-to-your-organizations-repositories/repository-roles-for-an-organization.md index 3353645513..cb1ad6aed0 100644 --- a/content/organizations/managing-user-access-to-your-organizations-repositories/repository-roles-for-an-organization.md +++ b/content/organizations/managing-user-access-to-your-organizations-repositories/repository-roles-for-an-organization.md @@ -24,7 +24,7 @@ You can give organization members, outside collaborators, and teams of people di From least access to most access, the roles for an organization repository are: - **Read**: Recommended for non-code contributors who want to view or discuss your project -- **Triage**: Recommended for contributors who need to proactively manage issues and pull requests without write access +- **Triage**: Recommended for contributors who need to proactively manage issues{% ifversion discussions-moderators-control-who-can-report %}, discussions,{% endif %} and pull requests without write access - **Write**: Recommended for contributors who actively push to your project - **Maintain**: Recommended for project managers who need to manage the repository without access to sensitive or destructive actions - **Admin**: Recommended for people who need full access to the project, including sensitive and destructive actions like managing security or deleting a repository @@ -92,8 +92,7 @@ Some of the features listed below are limited to organizations using {% data var | Merge a [pull request](/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges) | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | | Push to (write) the person or team's assigned repositories | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | | Edit and delete anyone's comments on commits, pull requests, and issues | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | -| [Hide anyone's comments](/communities/moderating-comments-and-conversations/managing-disruptive-comments) | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | -| [Lock conversations](/communities/moderating-comments-and-conversations/locking-conversations) | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | +| [Hide anyone's comments](/communities/moderating-comments-and-conversations/managing-disruptive-comments) | | {% ifversion discussions-moderators-control-who-can-report %}**✔️**{% endif %} | **✔️** | **✔️** | **✔️** || [Lock conversations](/communities/moderating-comments-and-conversations/locking-conversations) | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | | Transfer issues (see "[AUTOTITLE](/issues/tracking-your-work-with-issues/transferring-an-issue-to-another-repository)" for details) | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | | [Act as a designated code owner for a repository](/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners) | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | | [Mark a draft pull request as ready for review](/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request) | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | @@ -139,8 +138,7 @@ Some of the features listed below are limited to organizations using {% data var | Create autolink references to external resources, like Jira or Zendesk (see "[AUTOTITLE](/repositories/managing-your-repositorys-settings-and-features/managing-repository-settings/configuring-autolinks-to-reference-external-resources)") | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} |{% ifversion discussions %} | [Enable {% data variables.product.prodname_discussions %}](/repositories/managing-your-repositorys-settings-and-features/enabling-features-for-your-repository/enabling-or-disabling-github-discussions-for-a-repository) in a repository | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | | [Create and edit categories](/discussions/managing-discussions-for-your-community/managing-categories-for-discussions) for {% data variables.product.prodname_discussions %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | -| [Move a discussion to a different category](/discussions/managing-discussions-for-your-community/managing-discussions) | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | -| [Transfer a discussion](/discussions/managing-discussions-for-your-community/managing-discussions) to a new repository| {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | +| [Move a discussion to a different category](/discussions/managing-discussions-for-your-community/managing-discussions) | | {% ifversion discussions-moderators-control-who-can-report %}**✔️**{% endif %} | **✔️** | **✔️** | **✔️** || [Transfer a discussion](/discussions/managing-discussions-for-your-community/managing-discussions) to a new repository| {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | | [Manage pinned discussions](/discussions/managing-discussions-for-your-community/managing-discussions) | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | | [Convert issues to discussions in bulk](/discussions/managing-discussions-for-your-community/managing-discussions) | {% octicon "x" aria-label="No" %} | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | | [Lock and unlock discussions](/discussions/managing-discussions-for-your-community/moderating-discussions) | {% octicon "x" aria-label="No" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | {% octicon "check" aria-label="Yes" %} | diff --git a/data/features/discussions-moderators-control-who-can-report.yml b/data/features/discussions-moderators-control-who-can-report.yml new file mode 100644 index 0000000000..a692fcf5ed --- /dev/null +++ b/data/features/discussions-moderators-control-who-can-report.yml @@ -0,0 +1,5 @@ +# Issue #9162 +# Giving moderators more controls over who can report content and make changes in Discussions +versions: + fpt: '*' + ghec: '*'