Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream
# Conflicts: # Content.IntegrationTests/Tests/PostMapInitTest.cs # Content.Shared/Lock/LockSystem.cs # Resources/Maps/oasis.yml # Resources/Prototypes/Maps/Pools/default.yml # Resources/Prototypes/audio.yml
This commit is contained in:
2
.github/workflows/labeler-review.yml
vendored
2
.github/workflows/labeler-review.yml
vendored
@@ -16,7 +16,7 @@ jobs:
|
||||
with:
|
||||
username: ${{ github.actor }}
|
||||
team: "content-maintainers,junior-maintainers"
|
||||
GITHUB_TOKEN: ${{ secrets.GH_PAT }}
|
||||
GITHUB_TOKEN: ${{ secrets.LABELER_PAT }}
|
||||
- if: ${{ steps.checkUserMember.outputs.isTeamMember == 'true' }}
|
||||
uses: actions-ecosystem/action-add-labels@v1
|
||||
with:
|
||||
|
||||
Reference in New Issue
Block a user