-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
dev -> Master #1600
dev -> Master #1600
Commits on May 30, 2024
-
Merge pull request #1589 from pi-hole/master
Sync master back into development
Configuration menu - View commit details
-
Copy full SHA for 7e5daa3 - Browse repository at this point
Copy the full SHA 7e5daa3View commit details
Commits on Jun 1, 2024
-
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2
Bumps [eps1lon/actions-label-merge-conflict](https://github.com/eps1lon/actions-label-merge-conflict) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/eps1lon/actions-label-merge-conflict/releases) - [Changelog](https://github.com/eps1lon/actions-label-merge-conflict/blob/main/CHANGELOG.md) - [Commits](eps1lon/actions-label-merge-conflict@v3.0.1...v3.0.2) --- updated-dependencies: - dependency-name: eps1lon/actions-label-merge-conflict dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Configuration menu - View commit details
-
Copy full SHA for 70f9bfe - Browse repository at this point
Copy the full SHA 70f9bfeView commit details -
Bump pytest-testinfra from 10.1.0 to 10.1.1 in /test
Bumps [pytest-testinfra](https://github.com/pytest-dev/pytest-testinfra) from 10.1.0 to 10.1.1. - [Release notes](https://github.com/pytest-dev/pytest-testinfra/releases) - [Changelog](https://github.com/pytest-dev/pytest-testinfra/blob/main/CHANGELOG.rst) - [Commits](pytest-dev/pytest-testinfra@10.1.0...10.1.1) --- updated-dependencies: - dependency-name: pytest-testinfra dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Configuration menu - View commit details
-
Copy full SHA for 0b08884 - Browse repository at this point
Copy the full SHA 0b08884View commit details -
Merge pull request #1590 from pi-hole/dependabot/github_actions/dev/e…
…ps1lon/actions-label-merge-conflict-3.0.2 Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2
Configuration menu - View commit details
-
Copy full SHA for a641a8f - Browse repository at this point
Copy the full SHA a641a8fView commit details -
Merge pull request #1592 from pi-hole/dependabot/pip/test/dev/pytest-…
…testinfra-10.1.1 Bump pytest-testinfra from 10.1.0 to 10.1.1 in /test
Configuration menu - View commit details
-
Copy full SHA for ee6e970 - Browse repository at this point
Copy the full SHA ee6e970View commit details
Commits on Jun 8, 2024
-
Bump pytest from 8.2.1 to 8.2.2 in /test
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.2.1 to 8.2.2. - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](pytest-dev/pytest@8.2.1...8.2.2) --- updated-dependencies: - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
Configuration menu - View commit details
-
Copy full SHA for 13af8e5 - Browse repository at this point
Copy the full SHA 13af8e5View commit details -
Merge pull request #1597 from pi-hole/dependabot/pip/test/dev/pytest-…
…8.2.2 Bump pytest from 8.2.1 to 8.2.2 in /test
Configuration menu - View commit details
-
Copy full SHA for b799ee3 - Browse repository at this point
Copy the full SHA b799ee3View commit details
Commits on Jun 15, 2024
-
fall back to using dpkg when arch is detected as x86_64 to make sure …
…we're not really on an i386 image to prevent wrong s6 overlay version being downloaded on a 32 bit image Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Configuration menu - View commit details
-
Copy full SHA for eda9fdc - Browse repository at this point
Copy the full SHA eda9fdcView commit details -
Merge pull request #1599 from pi-hole/tweak/386-workaround
[v5] Fix architecture detection for linux/386 images
Configuration menu - View commit details
-
Copy full SHA for f60e958 - Browse repository at this point
Copy the full SHA f60e958View commit details