Skip to content

Commit d885d54

Browse files
authored
Branch was updated using the 'autoupdate branch' Actions workflow.
2 parents 9c4d255 + 0307dcb commit d885d54

19 files changed

Lines changed: 89 additions & 9 deletions

.github/workflows/triage-unallowed-contributions.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Check unallowed file changes
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
paths:
66
- '.github/workflows/**'
77
- '.github/CODEOWNERS'
@@ -32,12 +32,12 @@ jobs:
3232
})
3333
3434
const botReviews = pullReviews.data
35-
.filter(review => review.user.login === 'docubot')
35+
.filter(review => review.user.login === 'github-actions[bot]')
3636
.sort((a, b) => new Date(b.submitted_at) - new Date(a.submitted_at))
3737
.shift()
3838
3939
if (botReviews) {
40-
console.log(`Pull request reviews authored by docubot: ${botReviews}`)
40+
console.log(`Pull request reviews authored by the github-action bot: ${botReviews}`)
4141
}
4242
return botReviews
4343
@@ -76,7 +76,7 @@ jobs:
7676
if: ${{ steps.filter.outputs.notAllowed == 'true' && (!steps.requested-change.outputs.result || fromJson(steps.requested-change.outputs.result).state != 'CHANGES_REQUESTED') }}
7777
uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
7878
with:
79-
github-token: ${{secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES}}
79+
github-token: ${{secrets.GITHUB_TOKEN}}
8080
script: |
8181
const changedFiles = ${{steps.filter.outputs.notAllowed_files}}
8282
const restFiles = ${{steps.filter.outputs.openapi_files}}
@@ -112,7 +112,7 @@ jobs:
112112
if: ${{ steps.filter.outputs.notAllowed == 'false' && steps.requested-change.outputs.result && fromJson(steps.requested-change.outputs.result).state == 'CHANGES_REQUESTED' }}
113113
uses: actions/github-script@626af12fe9a53dc2972b48385e7fe7dec79145c9
114114
with:
115-
github-token: ${{secrets.DOCUBOT_FR_PROJECT_BOARD_WORKFLOWS_REPO_ORG_READ_SCOPES}}
115+
github-token: ${{secrets.GITHUB_TOKEN}}
116116
script: |
117117
await github.pulls.dismissReview({
118118
...context.repo,
24.6 KB
Loading
13.8 KB
Loading
38 KB
Loading
33.4 KB
Loading
79.1 KB
Loading
30.3 KB
Loading

content/github/administering-a-repository/about-protected-branches.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@ versions:
1111
github-ae: '*'
1212
---
1313

14+
### About protected branches
15+
1416
{% data reusables.pull_requests.about-protected-branches %} You can choose to enforce restrictions on how a pull request is merged into your repository.
1517

1618
Repository owners and people with admin permissions for a repository can enforce certain workflows or requirements, before a collaborator can merge a branch in your repository by creating protected branch rules.
1719

1820
{% data reusables.repositories.branch-rules-example %} For more information, see "[Configuring protected branches](/articles/configuring-protected-branches/)."
1921

22+
{% data reusables.pull_requests.you-can-auto-merge %}
23+
2024
### Prioritization of protected branch rules
2125

2226
If a repository has multiple protected branch rules that affect the same branches, the rules that include a specific branch name have the highest priority. If there is more than one protected branch rule that references the same specific branch name, then the branch rule created first will have higher priority.

content/github/administering-a-repository/configuring-pull-request-merges.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Configuring pull request merges
3-
intro: 'You can configure pull request merges on {% data variables.product.product_location %} to match your workflow and preferences for managing Git history by enabling, disabling, or enforcing standard merge commits, squashed commits, or rebased commits on all pull requests in your repository.'
3+
intro: 'You can configure pull request merges on {% data variables.product.product_location %} to match your workflow and preferences for managing Git history.'
44
mapTopic: true
55
redirect_from:
66
- /articles/configuring-pull-request-merges

content/github/administering-a-repository/index.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ versions:
3939
{% link_in_list /about-merge-methods-on-github %}
4040
{% link_in_list /configuring-commit-squashing-for-pull-requests %}
4141
{% link_in_list /configuring-commit-rebasing-for-pull-requests %}
42+
{% link_in_list /managing-auto-merge-for-pull-requests-in-your-repository %}
4243
{% link_in_list /managing-the-automatic-deletion-of-branches %}
4344
{% topic_link_in_list /defining-the-mergeability-of-pull-requests %}
4445
{% link_in_list /about-protected-branches %}

0 commit comments

Comments
 (0)