Merge branch '4.x' into 5.x

This commit is contained in:
Ben Ramsey
2022-09-12 17:12:23 -05:00
4 changed files with 211 additions and 365 deletions
@@ -17,7 +17,8 @@ jobs:
steps:
- name: Auto-Merge
if: ${{ github.event.workflow_run.conclusion == 'success' }}
uses: ridedott/merge-me-action@v2
uses: ridedott/merge-me-action@v2.10.20
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MERGE_METHOD: MERGE
# This must be used as GitHub Actions token does not support pushing
# to protected branches.
GITHUB_TOKEN: ${{ secrets.MERGE_TOKEN }}