Merge branch 'django:main' into ticket_33862

.git-blame-ignore-revs

@@ -2,3 +2,4 @@ ca88caa1031c0de545d82de8d90dcae0e03651fb
 c5cd8783825b5f6384417dac5f3889b4210b7d08
 9c19aff7c7561e3a82978a272ecdaad40dda5c00
 7119f40c9881666b6f9b5cf7df09ee1d21cc8344
+c18861804feb6a97afbeabb51be748dd60a04458

.github/workflows/docs.yml

@@ -16,6 +16,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   docs:
     # OS must be the same as on djangoproject.com.

.github/workflows/linters.yml

@@ -14,6 +14,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   flake8:
     name: flake8
@@ -27,7 +30,8 @@ jobs:
           python-version: '3.10'
       - run: python -m pip install flake8
       - name: flake8
-        uses: liskin/gh-problem-matcher-wrap@v1
+        # Pinned to v1.0.1.
+        uses: liskin/gh-problem-matcher-wrap@d9e345a28ab1eeb00c349e8bb199a102aa58acba
         with:
           linters: flake8
           run: flake8
@@ -43,7 +47,8 @@ jobs:
           python-version: '3.10'
       - run: python -m pip install isort
       - name: isort
-        uses: liskin/gh-problem-matcher-wrap@v1
+        # Pinned to v1.0.1.
+        uses: liskin/gh-problem-matcher-wrap@d9e345a28ab1eeb00c349e8bb199a102aa58acba
         with:
           linters: isort
           run: isort --check --diff django tests scripts

.github/workflows/new_contributor_pr.yml

@@ -4,6 +4,10 @@ on:
   pull_request_target:
     types: [opened]
 
+permissions:
+  issues: write
+  pull-requests: read
+
 jobs:
   build:
     name: Hello new contributor

.github/workflows/schedule_tests.yml

@@ -7,6 +7,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   windows:
     runs-on: windows-latest

.github/workflows/schedules.yml

@@ -5,6 +5,10 @@ on:
     - cron: '42 2 * * *'
   workflow_dispatch:
 
+permissions:
+  actions: write
+  contents: read
+
 jobs:
   trigger-runs:
     runs-on: ubuntu-latest

.github/workflows/tests.yml

@@ -14,6 +14,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+permissions:
+  contents: read
+
 jobs:
   windows:
     runs-on: windows-latest

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 5.0.0
     hooks:
       - id: flake8
   - repo: https://github.com/pre-commit/mirrors-eslint

AUTHORS

@@ -322,6 +322,7 @@ answer newbie questions, and generally made Django that much better:
     Filip Noetzel <http://filip.noetzel.co.uk/>
     Filip Wasilewski <filip.wasilewski@gmail.com>
     Finn Gruwier Larsen <finn@gruwier.dk>
+    Fiza Ashraf <fizaashraf37@gmail.com>
     Flávio Juvenal da Silva Junior <flavio@vinta.com.br>
     flavio.curella@gmail.com
     Florian Apolloner <florian@apolloner.eu>
@@ -798,6 +799,7 @@ answer newbie questions, and generally made Django that much better:
     Raffaele Salmaso <raffaele@salmaso.org>
     Rajesh Dhawan <rajesh.dhawan@gmail.com>
     Ramez Ashraf <ramezashraf@gmail.com>
+    Ramil Yanbulatov <rayman1104@gmail.com>
     Ramin Farajpour Cami <ramin.blackhat@gmail.com>
     Ramiro Morales <ramiro@rmorales.net>
     Ramon Saraiva <ramonsaraiva@gmail.com>