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
434 workflow runs
434 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #1777 from pi-hole/development Check for merge conflicts #1146: Commit 78aee9e pushed by PromoFaux
March 4, 2025 17:46 11s 2025.03.0
2025.03.0
March 4, 2025 17:46 11s
Sync master back into development Check for merge conflicts #1145: Pull request #1757 synchronize by PromoFaux
March 4, 2025 17:38 12s
March 4, 2025 17:38 12s
Merge pull request #1777 from pi-hole/development Check for merge conflicts #1144: Commit 78aee9e pushed by PromoFaux
March 4, 2025 17:38 2m 11s master
master
March 4, 2025 17:38 2m 11s
Merge pull request #1758 from pi-hole/secrets Check for merge conflicts #1143: Commit c26f896 pushed by PromoFaux
March 4, 2025 17:37 2m 10s development
development
March 4, 2025 17:37 2m 10s
Merge pull request #1760 from pi-hole/update/docker_cli Check for merge conflicts #1142: Commit e07a42c pushed by PromoFaux
March 4, 2025 14:39 2m 12s development
development
March 4, 2025 14:39 2m 12s
Merge pull request #1768 from casperklein/patch-1 Check for merge conflicts #1141: Commit a9b5267 pushed by PromoFaux
March 3, 2025 12:58 2m 10s development
development
March 3, 2025 12:58 2m 10s
Add NTP port to docker compose example & Dockerfile Check for merge conflicts #1140: Pull request #1768 synchronize by casperklein
March 3, 2025 00:31 11s
March 3, 2025 00:31 11s
Add NTP port to docker compose example & Dockerfile Check for merge conflicts #1139: Pull request #1768 synchronize by casperklein
March 2, 2025 23:21 10s
March 2, 2025 23:21 10s
Merge pull request #1741 from pi-hole/example_interface Check for merge conflicts #1138: Commit d82ce16 pushed by PromoFaux
February 28, 2025 13:15 14s 2025.02.7
2025.02.7
February 28, 2025 13:15 14s
Update test docker container to Alpine 3.21 and docker_cli 28.0.0. Check for merge conflicts #1137: Commit 3258c32 pushed by yubiuser
February 25, 2025 14:04 14s update/docker_cli
update/docker_cli
February 25, 2025 14:04 14s
WEBPASSWORD_FILE is mounted to /run/secrets Check for merge conflicts #1136: Pull request #1758 synchronize by yubiuser
February 25, 2025 12:18 10s
February 25, 2025 12:18 10s
Remove v5 migration leftover Check for merge conflicts #1135: Commit 4fa81da pushed by yubiuser
February 25, 2025 12:18 12s secrets
secrets
February 25, 2025 12:18 12s
WEBPASSWORD_FILE is mounted to /run/secrets Check for merge conflicts #1134: Commit 8ba706e pushed by yubiuser
February 25, 2025 07:33 10s secrets
secrets
February 25, 2025 07:33 10s
Merge pull request #1741 from pi-hole/example_interface Check for merge conflicts #1133: Commit d82ce16 pushed by yubiuser
February 25, 2025 04:51 2m 10s master
master
February 25, 2025 04:51 2m 10s
Merge pull request #1746 from pi-hole/healthcheck Check for merge conflicts #1132: Commit 6324ec7 pushed by yubiuser
February 24, 2025 18:52 2m 15s development
development
February 24, 2025 18:52 2m 15s
Merge pull request #1731 from pi-hole/development Check for merge conflicts #1131: Commit 29b604a pushed by PromoFaux
February 24, 2025 18:11 12s 2025.02.6
2025.02.6
February 24, 2025 18:11 12s
Allow custom web interface URI for Pi-hole admin Check for merge conflicts #1130: Pull request #1739 synchronize by pepramon
February 24, 2025 17:59 13s
February 24, 2025 17:59 13s
Add tini Check for merge conflicts #1129: Commit 5354e1a pushed by yubiuser
February 24, 2025 15:16 11s tini
tini
February 24, 2025 15:16 11s
Merge pull request #1731 from pi-hole/development Check for merge conflicts #1128: Commit 29b604a pushed by PromoFaux
February 24, 2025 15:10 15s 2025.02.5
2025.02.5
February 24, 2025 15:10 15s
Merge pull request #1750 from pi-hole/password_file Check for merge conflicts #1127: Commit 838a020 pushed by PromoFaux
February 23, 2025 21:46 2m 13s development
development
February 23, 2025 21:46 2m 13s
Reintroduce missed docker secret handling (Redo) Check for merge conflicts #1126: Pull request #1750 synchronize by PromoFaux
February 23, 2025 21:31 9s
February 23, 2025 21:31 9s
Reintroduce ability to set web password from using docker secrets. Check for merge conflicts #1125: Commit 9a2e3c6 pushed by PromoFaux
February 23, 2025 21:31 10s password_file
password_file
February 23, 2025 21:31 10s
Reintroduce ability to set web password from using docker secrets. Check for merge conflicts #1124: Commit 98b0650 pushed by PromoFaux
February 23, 2025 21:10 10s password_file
password_file
February 23, 2025 21:10 10s
Reintroduce ability to set web password from using docker secrets. Check for merge conflicts #1123: Commit 9d55d91 pushed by PromoFaux
February 23, 2025 20:58 10s password_file
password_file
February 23, 2025 20:58 10s
Merge pull request #1749 from pi-hole/revert-1748-password_file Check for merge conflicts #1122: Commit 9b34ece pushed by PromoFaux
February 23, 2025 20:58 2m 10s development
development
February 23, 2025 20:58 2m 10s