Skip to content

Actions: pi-hole/docker-pi-hole

Actions

Check for merge conflicts

Actions

Loading...

Show workflow options

Create status badge

merge-conflict.yml
685 workflow runs
685 workflow runs
Event

Filter by event
Status

Filter by status
Branch
Actor

Filter by actor
Bump black from 24.1.1 to 24.3.0 in /test Check for merge conflicts #736: Commit 042c81f pushed by dependabot bot
March 20, 2024 18:10 11s dependabot/pip/test/black-24.3.0
dependabot/pip/test/black-24.3.0
March 20, 2024 18:10 11s
Bump pytest from 8.0.2 to 8.1.1 in /test Check for merge conflicts #735: Commit a58c17c pushed by dependabot bot
March 16, 2024 10:52 1m 0s dependabot/pip/test/dev/pytest-8.1.1
dependabot/pip/test/dev/pytest-8.1.1
March 16, 2024 10:52 1m 0s
Bump black from 24.2.0 to 24.3.0 in /test Check for merge conflicts #734: Commit 00ed068 pushed by dependabot bot
March 16, 2024 10:51 10s dependabot/pip/test/dev/black-24.3.0
dependabot/pip/test/dev/black-24.3.0
March 16, 2024 10:51 10s
Update Dockerfile to use a nifty buildkit feature allowing us to eith… Check for merge conflicts #733: Commit 292a6b9 pushed by PromoFaux
March 16, 2024 01:56 11s v6/buildkit-fancyness
v6/buildkit-fancyness
March 16, 2024 01:56 11s
Merge pull request #1551 from pi-hole/v6/basic-tweaks Check for merge conflicts #732: Commit cdded14 pushed by PromoFaux
March 16, 2024 01:03 2m 10s development-v6
development-v6
March 16, 2024 01:03 2m 10s
Tidy up a few things in the readme and code. Check for merge conflicts #731: Pull request #1551 synchronize by PromoFaux
March 11, 2024 18:14 13s
March 11, 2024 18:14 13s
Address comments. Check for merge conflicts #730: Commit 24006c7 pushed by PromoFaux
March 11, 2024 18:14 10s v6/basic-tweaks
v6/basic-tweaks
March 11, 2024 18:14 10s
Tidy up a few things in the readme and code. Check for merge conflicts #729: Pull request #1551 synchronize by PromoFaux
March 11, 2024 17:33 16s
March 11, 2024 17:33 16s
Address comments. One test not passing locally, but cannot see what h… Check for merge conflicts #728: Commit 60072ca pushed by PromoFaux
March 11, 2024 17:33 11s v6/basic-tweaks
v6/basic-tweaks
March 11, 2024 17:33 11s
Tidy up a few things in the readme and code. Check for merge conflicts #727: Commit 9fefa11 pushed by PromoFaux
March 10, 2024 19:30 11s v6/basic-tweaks
v6/basic-tweaks
March 10, 2024 19:30 11s
Merge pull request #1541 from pi-hole/dependabot/pip/test/dev/pytest-… Check for merge conflicts #726: Commit 061251e pushed by yubiuser
March 2, 2024 12:01 2m 10s dev
dev
March 2, 2024 12:01 2m 10s
Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test Check for merge conflicts #725: Pull request #1541 synchronize by dependabot bot
March 2, 2024 11:59 10s
March 2, 2024 11:59 10s
Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test Check for merge conflicts #724: Commit 146dc52 pushed by dependabot bot
March 2, 2024 11:59 12s dependabot/pip/test/dev/pytest-testinfra-10.1.0
dependabot/pip/test/dev/pytest-testinfra-10.1.0
March 2, 2024 11:59 12s
Merge pull request #1542 from pi-hole/dependabot/pip/test/dev/black-2… Check for merge conflicts #723: Commit 2bb820b pushed by yubiuser
March 2, 2024 11:58 2m 12s dev
dev
March 2, 2024 11:58 2m 12s
Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test Check for merge conflicts #722: Pull request #1541 synchronize by dependabot bot
March 2, 2024 11:52 12s
March 2, 2024 11:52 12s
Bump pytest-testinfra from 10.0.0 to 10.1.0 in /test Check for merge conflicts #721: Commit 6085bb7 pushed by dependabot bot
March 2, 2024 11:52 9s dependabot/pip/test/dev/pytest-testinfra-10.1.0
dependabot/pip/test/dev/pytest-testinfra-10.1.0
March 2, 2024 11:52 9s
Bump black from 24.1.1 to 24.2.0 in /test Check for merge conflicts #720: Pull request #1542 synchronize by dependabot bot
March 2, 2024 11:51 11s
March 2, 2024 11:51 11s
Bump black from 24.1.1 to 24.2.0 in /test Check for merge conflicts #719: Commit 23b3a42 pushed by dependabot bot
March 2, 2024 11:51 17s dependabot/pip/test/dev/black-24.2.0
dependabot/pip/test/dev/black-24.2.0
March 2, 2024 11:51 17s
Merge pull request #1549 from pi-hole/dependabot/pip/test/dev/pytest-… Check for merge conflicts #718: Commit f073ab3 pushed by yubiuser
March 2, 2024 11:51 2m 11s dev
dev
March 2, 2024 11:51 2m 11s
Bump pytest from 8.0.0 to 8.0.2 in /test Check for merge conflicts #717: Commit 02c93b3 pushed by dependabot bot
March 2, 2024 10:11 12s dependabot/pip/test/dev/pytest-8.0.2
dependabot/pip/test/dev/pytest-8.0.2
March 2, 2024 10:11 12s
Merge pull request #1545 from pi-hole/master Check for merge conflicts #716: Commit e3f1583 pushed by PromoFaux
February 26, 2024 22:09 2m 13s dev
dev
February 26, 2024 22:09 2m 13s
Merge pull request #1544 from pi-hole/dev Check for merge conflicts #715: Commit 91ff566 pushed by PromoFaux
February 26, 2024 21:33 14s 2024.02.2
2024.02.2
February 26, 2024 21:33 14s
Bump aiohttp from 3.9.1 to 3.9.2 in /test Check for merge conflicts #714: Commit f43b448 pushed by dependabot bot
February 26, 2024 21:32 11s dependabot/pip/test/aiohttp-3.9.2
dependabot/pip/test/aiohttp-3.9.2
February 26, 2024 21:32 11s
Merge pull request #1544 from pi-hole/dev Check for merge conflicts #713: Commit 91ff566 pushed by PromoFaux
February 26, 2024 21:29 14s master
master
February 26, 2024 21:29 14s
Update the v6 workflow in the master branch so that the nightly conti… Check for merge conflicts #712: Commit b9ca401 pushed by PromoFaux
February 26, 2024 20:20 11s 2024.02.1
2024.02.1
February 26, 2024 20:20 11s