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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #1455 from pi-hole/dependabot/github_actions/dev/d… Check for merge conflicts #448: Commit 147eecb pushed by PromoFaux
October 16, 2023 17:37 2m 11s dev
dev
October 16, 2023 17:37 2m 11s
Merge pull request #1454 from pi-hole/dependabot/github_actions/dev/d… Check for merge conflicts #447: Commit 5a46d23 pushed by PromoFaux
October 16, 2023 17:36 2m 13s dev
dev
October 16, 2023 17:36 2m 13s
!!!BREAKING CHANGE!!! use printenv instead of declare when converting FTLCONF_ environment variables Check for merge conflicts #446: Pull request #1457 synchronize by PromoFaux
October 16, 2023 17:00 24s
October 16, 2023 17:00 24s
Fix tests Check for merge conflicts #445: Commit 55d0ef5 pushed by PromoFaux
October 16, 2023 17:00 13s v6/printenv
v6/printenv
October 16, 2023 17:00 13s
!!!BREAKING CHANGE!!! use printenv instead of declare to list the… Check for merge conflicts #444: Commit 05d1995 pushed by PromoFaux
October 16, 2023 16:40 16s v6/printenv
v6/printenv
October 16, 2023 16:40 16s
Add special handling for FTL Config names that have underscores in them Check for merge conflicts #443: Commit 0489e57 pushed by PromoFaux
October 16, 2023 16:11 17s v6/special-env
v6/special-env
October 16, 2023 16:11 17s
Bump docker/setup-buildx-action from 2 to 3 Check for merge conflicts #442: Commit 062ce99 pushed by dependabot bot
October 14, 2023 10:45 13s dependabot/github_actions/dev/docker/setup-buildx-action-3
dependabot/github_actions/dev/docker/setup-buildx-action-3
October 14, 2023 10:45 13s
Bump docker/login-action from 2 to 3 Check for merge conflicts #441: Commit b2798d4 pushed by dependabot bot
October 14, 2023 10:45 11s dependabot/github_actions/dev/docker/login-action-3
dependabot/github_actions/dev/docker/login-action-3
October 14, 2023 10:45 11s
Take a leaf from the bare metal pihole-FTL service and introduce a wr… Check for merge conflicts #440: Commit 2aabc4c pushed by PromoFaux
October 13, 2023 17:47 16s v6/service-wrapper
v6/service-wrapper
October 13, 2023 17:47 16s
Merge pull request #1450 from pi-hole/adminlte-to-web Check for merge conflicts #439: Commit 27b4c8a pushed by PromoFaux
October 8, 2023 18:51 10s development-v6
development-v6
October 8, 2023 18:51 10s
Merge pull request #1451 from pi-hole/adminlte-to-web-v5 Check for merge conflicts #438: Commit cb9db0d pushed by PromoFaux
October 8, 2023 18:51 2m 13s dev
dev
October 8, 2023 18:51 2m 13s
adminLTE->web Check for merge conflicts #437: Commit 578b4f0 pushed by PromoFaux
October 8, 2023 13:15 44s adminlte-to-web-v5
adminlte-to-web-v5
October 8, 2023 13:15 44s
AdminLTE -> web Check for merge conflicts #436: Commit 6fa1759 pushed by PromoFaux
October 8, 2023 13:06 11s adminlte-to-web
adminlte-to-web
October 8, 2023 13:06 11s
Merge pull request #1444 from pi-hole/readme/altbranches Check for merge conflicts #435: Commit 938f3a2 pushed by PromoFaux
October 8, 2023 12:50 16s development-v6
development-v6
October 8, 2023 12:50 16s
Add instructions for rebuilding the image with a custom component branch Check for merge conflicts #434: Pull request #1444 synchronize by PromoFaux
October 8, 2023 12:22 10s
October 8, 2023 12:22 10s
Add valid args Check for merge conflicts #433: Commit 4c2d0ab pushed by PromoFaux
October 8, 2023 12:22 10s readme/altbranches
readme/altbranches
October 8, 2023 12:22 10s
Merge pull request #1449 from SamTV12345/dev Check for merge conflicts #432: Commit b1042bf pushed by PromoFaux
October 8, 2023 12:12 2m 15s dev
dev
October 8, 2023 12:12 2m 15s
Fixed spellcheck. Check for merge conflicts #431: Pull request #1449 synchronize by PromoFaux
October 8, 2023 12:09 12s
October 8, 2023 12:09 12s
Merge pull request #1443 from pi-hole/master Check for merge conflicts #430: Commit 8439628 pushed by PromoFaux
October 8, 2023 12:09 2m 10s dev
dev
October 8, 2023 12:09 2m 10s
Sync master back into development Check for merge conflicts #429: Pull request #1443 synchronize by PromoFaux
October 8, 2023 12:09 13s
October 8, 2023 12:09 13s
Update test-and-build-v6.yml Check for merge conflicts #428: Commit 832e3e5 pushed by PromoFaux
October 8, 2023 12:09 11s master
master
October 8, 2023 12:09 11s
Sync master back into development Check for merge conflicts #427: Pull request #1443 synchronize by PromoFaux
October 6, 2023 12:25 16s
October 6, 2023 12:25 16s
Update test-and-build-v6.yml Check for merge conflicts #426: Commit 8951808 pushed by PromoFaux
October 6, 2023 12:25 16s master
master
October 6, 2023 12:25 16s
ProTip! You can narrow down the results and go further in time using created:<2023-10-06 or the other filters available.