diff --git a/assets/images/help/repository/PR-bypass-requirements-with-apps.png b/assets/images/help/repository/PR-bypass-requirements-with-apps.png new file mode 100644 index 0000000000..8403bbe8d3 Binary files /dev/null and b/assets/images/help/repository/PR-bypass-requirements-with-apps.png differ diff --git a/assets/images/help/repository/PR-review-required-dismissals-with-apps.png b/assets/images/help/repository/PR-review-required-dismissals-with-apps.png new file mode 100644 index 0000000000..bd2f52119c Binary files /dev/null and b/assets/images/help/repository/PR-review-required-dismissals-with-apps.png differ diff --git a/assets/images/help/repository/allow-force-pushes-specify-who-with-apps.png b/assets/images/help/repository/allow-force-pushes-specify-who-with-apps.png new file mode 100644 index 0000000000..06518339cf Binary files /dev/null and b/assets/images/help/repository/allow-force-pushes-specify-who-with-apps.png differ diff --git a/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md b/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md index 249403b393..a3554ebd90 100644 --- a/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md +++ b/content/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule.md @@ -68,11 +68,11 @@ When you create a branch rule, the branch you specify doesn't have to exist yet - Optionally, to require review from a code owner when the pull request affects code that has a designated owner, select **Require review from Code Owners**. For more information, see "[About code owners](/github/creating-cloning-and-archiving-repositories/about-code-owners)." ![Require review from code owners](/assets/images/help/repository/PR-review-required-code-owner.png) {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5611 %} - - Optionally, to allow specific people or teams to push code to the branch without creating pull requests when they're required, select **Allow specific actors to bypass required pull requests**. Then, search for and select the people or teams who should be allowed to skip creating a pull request. - ![Allow specific actors to bypass pull request requirements checkbox](/assets/images/help/repository/PR-bypass-requirements.png) + - Optionally, to allow specific actors to push code to the branch without creating pull requests when they're required, select **Allow specified actors to bypass required pull requests**. Then, search for and select the actors who should be allowed to skip creating a pull request. + ![Allow specific actors to bypass pull request requirements checkbox]{% if integration-branch-protection-exceptions %}(/assets/images/help/repository/PR-bypass-requirements-with-apps.png){% else %}(/assets/images/help/repository/PR-bypass-requirements.png){% endif %} {% endif %} - - Optionally, if the repository is part of an organization, select **Restrict who can dismiss pull request reviews**. Then, search for and select the people or teams who are allowed to dismiss pull request reviews. For more information, see "[Dismissing a pull request review](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/dismissing-a-pull-request-review)." - ![Restrict who can dismiss pull request reviews checkbox](/assets/images/help/repository/PR-review-required-dismissals.png) + - Optionally, if the repository is part of an organization, select **Restrict who can dismiss pull request reviews**. Then, search for and select the actors who are allowed to dismiss pull request reviews. For more information, see "[Dismissing a pull request review](/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/dismissing-a-pull-request-review)." + ![Restrict who can dismiss pull request reviews checkbox]{% if integration-branch-protection-exceptions %}(/assets/images/help/repository/PR-review-required-dismissals-with-apps.png){% else %}(/assets/images/help/repository/PR-review-required-dismissals.png){% endif %} 1. Optionally, enable required status checks. For more information, see "[About status checks](/pull-requests/collaborating-with-pull-requests/collaborating-on-repositories-with-code-quality-features/about-status-checks)." - Select **Require status checks to pass before merging**. ![Required status checks option](/assets/images/help/repository/required-status-checks.png) @@ -115,8 +115,8 @@ When you create a branch rule, the branch you specify doesn't have to exist yet {% ifversion fpt or ghec or ghes > 3.3 or ghae-issue-5624 %} Then, choose who can force push to the branch. - Select **Everyone** to allow everyone with at least write permissions to the repository to force push to the branch, including those with admin permissions. - - Select **Specify who can force push** to allow only specific people or teams to force push to the branch. Then, search for and select those people or teams. - ![Screenshot of the options to specify who can force push](/assets/images/help/repository/allow-force-pushes-specify-who.png) + - Select **Specify who can force push** to allow only specific actors to force push to the branch. Then, search for and select those actors. + ![Screenshot of the options to specify who can force push]{% if integration-branch-protection-exceptions %}(/assets/images/help/repository/allow-force-pushes-specify-who-with-apps.png){% else %}(/assets/images/help/repository/allow-force-pushes-specify-who.png){% endif %} {% endif %} For more information about force pushes, see "[Allow force pushes](/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/about-protected-branches/#allow-force-pushes)." diff --git a/data/features/integration-branch-protection-exceptions.yml b/data/features/integration-branch-protection-exceptions.yml new file mode 100644 index 0000000000..50d2e94a3a --- /dev/null +++ b/data/features/integration-branch-protection-exceptions.yml @@ -0,0 +1,7 @@ +# Reference: #6665 +# GitHub Apps are supported as actors in all types of exceptions to branch protections +versions: + fpt: '*' + ghec: '*' + ghes: '>= 3.6' + ghae: 'issue-6665'