Skip to content

Commit e82e038

Browse files
committed
Merge branch 'master' into fix/webhook-view-edits
# Conflicts: # CHANGELOG.md
2 parents cd99706 + 0a0c074 commit e82e038

41 files changed

Lines changed: 126 additions & 490 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/codeql.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ jobs:
2626
language: ["python"]
2727
steps:
2828
- name: "Checkout repository"
29-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
29+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3030
- name: "Initialize CodeQL"
31-
uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
31+
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
3232
with:
3333
languages: ${{ matrix.language }}
3434
- name: "Autobuild"
35-
uses: github/codeql-action/autobuild@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
35+
uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
3636
- name: "Perform CodeQL Analysis"
37-
uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
37+
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2

.github/workflows/docs-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
runs-on: ubuntu-latest
3737
steps:
3838
- name: "Checkout Repository"
39-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
39+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
4040
- name: "Setup Python"
4141
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
4242
with:

.github/workflows/docs-json-export.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- name: Checkout repository
1515
id: checkout
16-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
16+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1717
- name: Set up Python
1818
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
1919
id: setup-python

.github/workflows/docs-localization-download.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
pr_id: ${{ steps.convert_outputs.outputs.pr_id }}
1616
steps:
1717
- name: "Checkout Repository"
18-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
18+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
1919
with:
2020
fetch-tags: true
2121
- name: "Install Python"
@@ -74,7 +74,7 @@ jobs:
7474
environment: translations
7575
steps:
7676
- name: "Checkout Repository"
77-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
77+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7878
- name: "Refresh Pull"
7979
run: |
8080
git fetch --all

.github/workflows/docs-localization-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
environment: translations
2121
steps:
2222
- name: "Checkout Repository"
23-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
23+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2424
with:
2525
fetch-tags: true
2626
- name: "Install Python"

.github/workflows/lib-checks.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: "Checkout Repository"
35-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
35+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3636
- name: "Setup Python"
3737
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
3838
with:
@@ -52,7 +52,7 @@ jobs:
5252
runs-on: ubuntu-latest
5353
steps:
5454
- name: "Checkout Repository"
55-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
55+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
5656
- name: "Setup Python"
5757
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
5858
with:
@@ -70,7 +70,7 @@ jobs:
7070
runs-on: ubuntu-latest
7171
steps:
7272
- name: "Checkout Repository"
73-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
73+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
7474
- name: "Setup Python"
7575
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
7676
with:
@@ -94,7 +94,7 @@ jobs:
9494
runs-on: ubuntu-latest
9595
steps:
9696
- name: "Checkout Repository"
97-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
97+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
9898
- name: "Setup Python"
9999
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
100100
with:
@@ -120,7 +120,7 @@ jobs:
120120
runs-on: ubuntu-latest
121121
steps:
122122
- name: "Checkout Repository"
123-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
123+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
124124
- name: "Setup Python"
125125
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
126126
with:
@@ -144,7 +144,7 @@ jobs:
144144
python-version: [ "3.10", "3.11", "3.12", "3.13", "3.14" ]
145145
steps:
146146
- name: "Checkout Repository"
147-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
147+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
148148

149149
- name: "Setup Python"
150150
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: "Checkout Repository"
35-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
35+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
3636
with:
3737
fetch-depth: 0
3838
fetch-tags: true
@@ -115,7 +115,7 @@ jobs:
115115
GITHUB_TOKEN: ${{ secrets.ADMIN_GITHUB_TOKEN }}
116116
steps:
117117
- name: "Checkout Repository"
118-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
118+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
119119
with:
120120
fetch-depth: 0
121121
fetch-tags: true
@@ -251,7 +251,7 @@ jobs:
251251
environment: release
252252
steps:
253253
- name: "Checkout repository"
254-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
254+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
255255
with:
256256
fetch-depth: 0
257257
fetch-tags: true

.github/workflows/todo-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: "Checkout Repository"
24-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
24+
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
2525
- name: "Track TODO Action"
2626
uses: ribtoks/tdg-github-action@f093b9309d79281ff459a7e19793d64b96b03e2e # v0.4.16-beta
2727
with:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@ These changes are available on the `master` branch, but have not yet been releas
1616

1717
### Fixed
1818

19+
- Fix typehint for `SlashCommandGroup.__new__`.
20+
([#3235](https://github.com/Pycord-Development/pycord/pull/3235))
1921
- Include `bypass_slowmode` in `Permissions.all`.
2022
([#3231](https://github.com/Pycord-Development/pycord/pull/3231))
23+
- Allow `ForumTag` to be created without an emoji.
24+
([#3245](https://github.com/Pycord-Development/pycord/pull/3245))
2125
- Fixed `AttributeError` when using `Webhook.edit_message` with views.
2226
([#3239](https://github.com/Pycord-Development/pycord/pull/3239))
2327

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ follows PEP-8 guidelines (mostly) with a column limit of 120.
5757
## Use of "type: ignore" comments
5858

5959
In some cases, it might be necessary to ignore type checker warnings for one reason or
60-
another. If that is that case, it is **required** that a comment is left explaining why
60+
another. If that is the case, it is **required** that a comment is left explaining why
6161
you are deciding to ignore type checking warnings.
6262

6363
### Licensing

0 commit comments

Comments
 (0)