summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump pip-tools from 6.3.0 to 6.4.0dependabot/pip/pip-tools-6.4.0dependabot[bot]2021-11-011-5/+5
* Merge branch '3.0.x'David Lord2021-10-046-35/+58
|\
| * Merge pull request #1506 from pallets/release-3.0.23.0.2David Lord2021-10-042-1/+3
| |\
| | * release version 3.0.2David Lord2021-10-042-1/+3
| |/
| * Merge pull request #1505 from pallets/package-loader-pathDavid Lord2021-10-043-1/+17
| |\
| | * omit curdir from PackageLoader root pathDavid Lord2021-10-043-1/+17
| |/
| * Merge pull request #1495 from daniel-stoneuk/patch-async-globalsDavid Lord2021-10-044-34/+39
| |\
| | * imported macros can access template globals in async modeDaniel Stone2021-10-044-34/+39
| |/
* | Merge branch '3.0.x'David Lord2021-10-0414-83/+88
|\ \ | |/
| * Merge pull request #1504 from pallets/update-requirementsDavid Lord2021-10-046-51/+55
| |\
| | * apply pyupgradeDavid Lord2021-10-041-1/+1
| | * update pre-commit hooksDavid Lord2021-10-041-4/+4
| | * update requirementsDavid Lord2021-10-044-46/+50
| * | Merge pull request #1503 from pallets/except-chainDavid Lord2021-10-045-32/+32
| |\ \ | | |/
| | * use exception chainingDavid Lord2021-10-045-32/+32
| |/
| * Merge pull request #1501 from pallets/ignore-internal-warningDavid Lord2021-10-041-0/+2
| |\
| | * ignore internal asyncio warningDavid Lord2021-10-041-0/+2
| |/
| * replace http with https in docsnabbisen2021-08-283-3/+3
* | Merge pull request #1492 from pallets/pre-commit-ci-update-configDavid Lord2021-09-081-2/+2
|\ \
| * | [pre-commit.ci] pre-commit autoupdatepre-commit-ci[bot]2021-09-061-2/+2
|/ /
* | Merge pull request #1490 from pallets/dependabot/pip/tox-3.24.3David Lord2021-09-011-1/+1
|\ \
| * | Bump tox from 3.24.1 to 3.24.3dependabot[bot]2021-09-011-1/+1
|/ /
* | Merge pull request #1489 from pallets/dependabot/pip/pre-commit-2.14.1David Lord2021-09-011-1/+1
|\ \
| * | Bump pre-commit from 2.13.0 to 2.14.1dependabot/pip/pre-commit-2.14.1dependabot[bot]2021-09-011-1/+1
* | | Merge pull request #1491 from pallets/dependabot/pip/pytest-6.2.5David Lord2021-09-012-2/+2
|\ \ \ | |/ / |/| |
| * | Bump pytest from 6.2.4 to 6.2.5dependabot/pip/pytest-6.2.5dependabot[bot]2021-09-012-2/+2
|/ /
* | Merge remote-tracking branch 'origin/3.0.x'David Lord2021-08-109-8/+61
|\ \ | |/
| * Merge pull request #1482 from esadek/pip_linkDavid Lord2021-08-101-1/+1
| |\
| | * update pip linkEmil Sadek2021-08-101-1/+1
| |/
| * Merge pull request #1455 from ewjoachim/undefined-contains-1204David Lord2021-08-093-4/+6
| |\
| | * Fixes #1448: Revert Undefined.__contains__ to 2.x behaviourJoachim Jablon2021-08-093-4/+6
| |/
| * Merge pull request #1454 from atetubou/deterministic_testDavid Lord2021-08-094-2/+32
| |\
| | * make compile_templates deterministicTakuto Ikuta2021-08-094-2/+32
| |/
| * Merge pull request #1449 from amy-lei/loop-scopingDavid Lord2021-08-093-0/+15
| |\
| | * clear assignments in loops at end of iterationAmy2021-05-213-0/+15
| * | Merge pull request #1451 from greyli/improve-contributing-guideDavid Lord2021-05-251-2/+8
| |\ \ | | |/ | |/|
| | * Improve the contributing guideGrey Li2021-05-251-2/+8
| |/
* | Merge pull request #1479 from pallets/dependabot/pip/tox-3.24.1David Lord2021-08-031-1/+1
|\ \
| * | Bump tox from 3.23.1 to 3.24.1dependabot[bot]2021-08-011-1/+1
* | | Merge pull request #1480 from pallets/pre-commit-ci-update-configDavid Lord2021-08-032-4/+4
|\ \ \ | |/ / |/| |
| * | [pre-commit.ci] auto fixes from pre-commit.com hookspre-commit-ci[bot]2021-08-021-1/+1
| * | [pre-commit.ci] pre-commit autoupdatepre-commit-ci[bot]2021-08-021-3/+3
|/ /
* | Merge pull request #1472 from pallets/pre-commit-ci-update-configDavid Lord2021-07-061-3/+3
|\ \
| * | [pre-commit.ci] pre-commit autoupdatepre-commit-ci[bot]2021-07-051-3/+3
|/ /
* | Merge pull request #1469 from pallets/dependabot/pip/pip-tools-6.2.0David Lord2021-07-011-1/+3
|\ \
| * | Bump pip-tools from 6.1.0 to 6.2.0dependabot[bot]2021-07-011-1/+3
|/ /
* | Merge pull request #1470 from pallets/dependabot/pip/mypy-0.910David Lord2021-07-012-9/+8
|\ \
| * | Bump mypy from 0.812 to 0.910dependabot[bot]2021-07-012-9/+8
|/ /
* | Merge pull request #1457 from pallets/dependabot/pip/pre-commit-2.13.0David Lord2021-06-011-1/+1
|\ \
| * | Bump pre-commit from 2.12.1 to 2.13.0dependabot[bot]2021-06-011-1/+1
|/ /