Skip to content

Actions: pi-hole/docker-pi-hole

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
721 workflow runs
721 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

* Clean up some of the output for the container startup Check for merge conflicts #908: Commit 6a3fc96 pushed by PromoFaux
August 25, 2024 17:34 10s v6/migrate-v5-checks
v6/migrate-v5-checks
August 25, 2024 17:34 10s
Development v6 -> dev Check for merge conflicts #907: Pull request #1626 synchronize by PromoFaux
August 25, 2024 12:51 10s
August 25, 2024 12:51 10s
Merge pull request #1628 from pi-hole/default_tag Check for merge conflicts #906: Commit bcc6393 pushed by PromoFaux
August 25, 2024 12:51 13s development-v6
development-v6
August 25, 2024 12:51 13s
Set default tag for locally build images to pihole:local Check for merge conflicts #905: Pull request #1628 synchronize by PromoFaux
August 25, 2024 12:44 12s
August 25, 2024 12:44 12s
Update Readme to reflect new local image tag name Check for merge conflicts #904: Commit 794ba9a pushed by PromoFaux
August 25, 2024 12:44 11s default_tag
default_tag
August 25, 2024 12:44 11s
Set default tag for locally build images to pihole:local Check for merge conflicts #903: Commit c0fa8de pushed by yubiuser
August 25, 2024 09:51 12s default_tag
default_tag
August 25, 2024 09:51 12s
Merge branch 'dev' into development-v6 Check for merge conflicts #902: Commit 13798f0 pushed by PromoFaux
August 17, 2024 21:30 15s development-v6
development-v6
August 17, 2024 21:30 15s
Development v6 -> dev Check for merge conflicts #901: Pull request #1626 synchronize by PromoFaux
August 17, 2024 21:30 16s
August 17, 2024 21:30 16s
correct directory for local FTL binary Check for merge conflicts #900: Commit 353094c pushed by PromoFaux
August 14, 2024 16:57 14s development-v6
development-v6
August 14, 2024 16:57 14s
Bump aiohttp in /test in the pip group across 1 directory Check for merge conflicts #899: Commit fbc519f pushed by dependabot bot
August 9, 2024 18:23 11s dependabot/pip/test/pip-b0e7a334b4
dependabot/pip/test/pip-b0e7a334b4
August 9, 2024 18:23 11s
Merge pull request #1621 from pi-hole/update-alpine Check for merge conflicts #898: Commit 1c7d276 pushed by PromoFaux
August 9, 2024 13:50 10s development-v6
development-v6
August 9, 2024 13:50 10s
Bump alpine to 3.20 Check for merge conflicts #897: Pull request #1621 synchronize by yubiuser
August 9, 2024 10:21 15s
August 9, 2024 10:21 15s
No need to remember to update the python version Check for merge conflicts #896: Commit 953cee4 pushed by yubiuser
August 9, 2024 10:21 10s update-alpine
update-alpine
August 9, 2024 10:21 10s
Bump alpine to 3.20 Check for merge conflicts #895: Pull request #1621 synchronize by yubiuser
August 7, 2024 19:45 10s
August 7, 2024 19:45 10s
Fix tests Check for merge conflicts #894: Commit c0d822f pushed by yubiuser
August 7, 2024 19:45 10s update-alpine
update-alpine
August 7, 2024 19:45 10s
Bump alpine to 3.20 Check for merge conflicts #893: Pull request #1621 synchronize by PromoFaux
August 6, 2024 15:17 11s
August 6, 2024 15:17 11s
bump alpine to 3.20 Check for merge conflicts #892: Commit 1c6c1b3 pushed by PromoFaux
August 6, 2024 15:17 19s update-alpine
update-alpine
August 6, 2024 15:17 19s
Bump alpine to 3.20 Check for merge conflicts #891: Pull request #1621 synchronize by PromoFaux
August 6, 2024 15:13 11s
August 6, 2024 15:13 11s
bump alpine to 3.20 Check for merge conflicts #890: Commit e7c99e6 pushed by PromoFaux
August 6, 2024 15:13 11s update-alpine
update-alpine
August 6, 2024 15:13 11s
bump alpine to 3.20 Check for merge conflicts #889: Commit 81e589f pushed by PromoFaux
August 6, 2024 11:33 11s update-alpine
update-alpine
August 6, 2024 11:33 11s
Merge pull request #1620 from pi-hole/dependabot/pip/test/dev/black-2… Check for merge conflicts #888: Commit 6239412 pushed by yubiuser
August 3, 2024 11:42 13s dev
dev
August 3, 2024 11:42 13s
Bump black from 24.4.2 to 24.8.0 in /test Check for merge conflicts #887: Commit 9a48b6d pushed by dependabot bot
August 3, 2024 10:54 10s dependabot/pip/test/dev/black-24.8.0
dependabot/pip/test/dev/black-24.8.0
August 3, 2024 10:54 10s
Merge pull request #1615 from loeffelpan/dev Check for merge conflicts #886: Commit 6568baf pushed by PromoFaux
July 28, 2024 17:29 10s dev
dev
July 28, 2024 17:29 10s
Merge pull request #1616 from pi-hole/dependabot/pip/test/dev/pytest-… Check for merge conflicts #885: Commit 5e7d0b0 pushed by yubiuser
July 27, 2024 11:42 2m 11s dev
dev
July 27, 2024 11:42 2m 11s
Bump pytest from 8.2.2 to 8.3.2 in /test Check for merge conflicts #884: Commit 69da4b2 pushed by dependabot bot
July 27, 2024 10:10 9s dependabot/pip/test/dev/pytest-8.3.2
dependabot/pip/test/dev/pytest-8.3.2
July 27, 2024 10:10 9s