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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Dev -> master Check for merge conflicts #814: Pull request #1588 synchronize by PromoFaux
May 30, 2024 12:06 12s
May 30, 2024 12:06 12s
Merge branch 'master' into dev Check for merge conflicts #813: Commit ad108fe pushed by PromoFaux
May 30, 2024 12:06 14s dev
dev
May 30, 2024 12:06 14s
Merge pull request #1586 from pi-hole/fix/build.sh_help Check for merge conflicts #812: Commit be48e11 pushed by PromoFaux
May 28, 2024 08:28 11s development-v6
development-v6
May 28, 2024 08:28 11s
Add forgotten --load argument to the help text Check for merge conflicts #811: Commit d741857 pushed by rdwebdesign
May 28, 2024 01:10 14s fix/build.sh_help
fix/build.sh_help
May 28, 2024 01:10 14s
Allow arguments in any order and include new options Check for merge conflicts #810: Commit 1aab66d pushed by rdwebdesign
May 28, 2024 01:01 11s arguments_any_order
arguments_any_order
May 28, 2024 01:01 11s
Allow arguments in any order and include new options Check for merge conflicts #809: Commit 3e46e40 pushed by rdwebdesign
May 27, 2024 23:33 10s arguments_any_order
arguments_any_order
May 27, 2024 23:33 10s
Merge pull request #1585 from pi-hole/tweak/build.sh Check for merge conflicts #808: Commit 0b8ad5c pushed by PromoFaux
May 27, 2024 22:05 11s development-v6
development-v6
May 27, 2024 22:05 11s
Change default value of PIHOLE_DOCKER_TAG arg in dockerfile Check for merge conflicts #807: Pull request #1585 synchronize by PromoFaux
May 27, 2024 21:42 10s
May 27, 2024 21:42 10s
Change default value of PIHOLE_DOCKER_TAG in dockerfile Check for merge conflicts #806: Commit 4c8066a pushed by PromoFaux
May 27, 2024 21:42 11s tweak/build.sh
tweak/build.sh
May 27, 2024 21:42 11s
Change default value of PIHOLE_DOCKER_TAG in dockerfile Check for merge conflicts #805: Commit 5ead84a pushed by PromoFaux
May 27, 2024 21:39 12s tweak/build.sh
tweak/build.sh
May 27, 2024 21:39 12s
Change default value of PIHOLE_DOCKER_TAG in dockerfile Check for merge conflicts #804: Pull request #1584 synchronize by PromoFaux
May 27, 2024 21:38 10s
May 27, 2024 21:38 10s
Update DOCKER_BUILD_CMD in build.sh to include the "--load" flag Check for merge conflicts #803: Commit fdfc6ce pushed by PromoFaux
May 27, 2024 21:38 10s tweak/build.sh
tweak/build.sh
May 27, 2024 21:38 10s
Change default value of PIHOLE_DOCKER_TAG in dockerfile Check for merge conflicts #802: Pull request #1584 synchronize by PromoFaux
May 27, 2024 20:51 13s
May 27, 2024 20:51 13s
Update build.sh to include new options for Docker image tag and PADD … Check for merge conflicts #801: Commit b9e758f pushed by PromoFaux
May 27, 2024 20:51 13s tweak/build.sh
tweak/build.sh
May 27, 2024 20:51 13s
Change default value of PIHOLE_DOCKER_TAG in dockerfile Check for merge conflicts #800: Pull request #1584 synchronize by PromoFaux
May 27, 2024 20:39 9s
May 27, 2024 20:39 9s
Update build.sh to include new options for Docker image tag and PADD … Check for merge conflicts #799: Commit b4314b4 pushed by PromoFaux
May 27, 2024 20:39 11s tweak/build.sh
tweak/build.sh
May 27, 2024 20:39 11s
Update build.sh to include new options for Docker image tag and PADD … Check for merge conflicts #798: Commit 5ab7c19 pushed by PromoFaux
May 27, 2024 20:38 10s tweak/build.sh
tweak/build.sh
May 27, 2024 20:38 10s
change default PIHOLE_DOCKER_TAG value to be dev-unknown to match t… Check for merge conflicts #797: Commit 5f8b177 pushed by PromoFaux
May 27, 2024 20:32 14s tweak/build.sh
tweak/build.sh
May 27, 2024 20:32 14s
Merge pull request #1583 from pi-hole/tweak/build.sh Check for merge conflicts #796: Commit 7442d19 pushed by PromoFaux
May 27, 2024 17:20 14s development-v6
development-v6
May 27, 2024 17:20 14s
Update DOCKER_BUILD_CMD in build.sh to include the "--load" flag Check for merge conflicts #795: Commit fdfc6ce pushed by PromoFaux
May 27, 2024 17:05 15s tweak/build.sh
tweak/build.sh
May 27, 2024 17:05 15s
Merge pull request #1582 from pi-hole/dependabot/pip/test/dev/pytest-… Check for merge conflicts #794: Commit 2684349 pushed by yubiuser
May 25, 2024 19:54 2m 10s dev
dev
May 25, 2024 19:54 2m 10s
Bump pytest from 8.2.0 to 8.2.1 in /test Check for merge conflicts #793: Pull request #1582 synchronize by yubiuser
May 25, 2024 19:52 12s
May 25, 2024 19:52 12s
Fix codespell Check for merge conflicts #792: Commit 6f0bbb7 pushed by yubiuser
May 25, 2024 19:52 11s dependabot/pip/test/dev/pytest-8.2.1
dependabot/pip/test/dev/pytest-8.2.1
May 25, 2024 19:52 11s
Bump pytest from 8.2.0 to 8.2.1 in /test Check for merge conflicts #791: Commit 3a76e32 pushed by dependabot bot
May 25, 2024 10:29 10s dependabot/pip/test/dev/pytest-8.2.1
dependabot/pip/test/dev/pytest-8.2.1
May 25, 2024 10:29 10s
Add ENV variable for ConfigMap for adlists Check for merge conflicts #790: Pull request #1581 synchronize by gattjoe
May 14, 2024 20:22 11s
May 14, 2024 20:22 11s