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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #1687 from jnodorp/patch-1 Check for merge conflicts #1061: Commit 164cf4a pushed by yubiuser
February 8, 2025 07:39 2m 10s development
development
February 8, 2025 07:39 2m 10s
Clarify log message for missing caps Check for merge conflicts #1060: Pull request #1687 synchronize by jnodorp
February 8, 2025 07:07 10s
February 8, 2025 07:07 10s
Merge pull request #1686 from pi-hole/dependabot/pip/test/development… Check for merge conflicts #1059: Commit 228608d pushed by yubiuser
February 2, 2025 12:36 2m 11s development
development
February 2, 2025 12:36 2m 11s
Bump black from 24.10.0 to 25.1.0 in /test Check for merge conflicts #1058: Commit 67c884d pushed by dependabot bot
February 1, 2025 10:18 11s dependabot/pip/test/development/black-25.1.0
dependabot/pip/test/development/black-25.1.0
February 1, 2025 10:18 11s
Utilise FTL's native config upgrade functionality Check for merge conflicts #1057: Pull request #1683 synchronize by PromoFaux
January 30, 2025 19:20 11s
January 30, 2025 19:20 11s
Remove some redundant commented out code Check for merge conflicts #1056: Commit 6d93bb0 pushed by PromoFaux
January 30, 2025 19:20 14s explicit-migrate
explicit-migrate
January 30, 2025 19:20 14s
Merge pull request #1685 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1055: Commit 15ee5f6 pushed by PromoFaux
January 25, 2025 15:00 2m 15s development
development
January 25, 2025 15:00 2m 15s
Bump actions/stale from 9.0.0 to 9.1.0 Check for merge conflicts #1054: Commit 5404bf0 pushed by dependabot bot
January 25, 2025 10:56 10s dependabot/github_actions/development/actions/stale-9.1.0
dependabot/github_actions/development/actions/stale-9.1.0
January 25, 2025 10:56 10s
Utilise FTL's native config upgrade functionality Check for merge conflicts #1053: Pull request #1683 synchronize by PromoFaux
January 14, 2025 18:29 11s
January 14, 2025 18:29 11s
quiet, codespell Check for merge conflicts #1052: Commit e1eb2df pushed by PromoFaux
January 14, 2025 18:29 9s explicit-migrate
explicit-migrate
January 14, 2025 18:29 9s
Further tweaks to output - offset gravity schema upgrade messages to … Check for merge conflicts #1051: Commit 21756be pushed by PromoFaux
January 14, 2025 18:19 11s explicit-migrate
explicit-migrate
January 14, 2025 18:19 11s
Merge pull request #1681 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1050: Commit 820be48 pushed by yubiuser
January 11, 2025 14:03 2m 15s development
development
January 11, 2025 14:03 2m 15s
Bump eps1lon/actions-label-merge-conflict from 3.0.2 to 3.0.3 Check for merge conflicts #1049: Commit d5aa4d2 pushed by dependabot bot
January 11, 2025 10:33 12s dependabot/github_actions/development/eps1lon/actions-label-merge-conflict-3.0.3
dependabot/github_actions/development/eps1lon/actions-label-merge-conflict-3.0.3
January 11, 2025 10:33 12s
Merge pull request #1678 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #1048: Commit 0976be7 pushed by yubiuser
January 6, 2025 09:49 2m 12s development
development
January 6, 2025 09:49 2m 12s
Bump Chizkiyahu/delete-untagged-ghcr-action from 5 to 6 Check for merge conflicts #1047: Pull request #1678 synchronize by yubiuser
January 6, 2025 09:47 13s
January 6, 2025 09:47 13s
Login action is part of the delete-untagged action now Check for merge conflicts #1046: Commit 8f87949 pushed by yubiuser
January 6, 2025 09:47 13s dependabot/github_actions/development/Chizkiyahu/delete-untagged-ghcr-action-6
dependabot/github_actions/development/Chizkiyahu/delete-untagged-ghcr-action-6
January 6, 2025 09:47 13s
get rid of the actions i dont need Check for merge conflicts #1045: Pull request #1679 synchronize by toestreich
January 5, 2025 19:46 10s
January 5, 2025 19:46 10s
Bump Chizkiyahu/delete-untagged-ghcr-action from 5 to 6 Check for merge conflicts #1044: Commit 59d9218 pushed by dependabot bot
January 4, 2025 10:27 10s dependabot/github_actions/development/Chizkiyahu/delete-untagged-ghcr-action-6
dependabot/github_actions/development/Chizkiyahu/delete-untagged-ghcr-action-6
January 4, 2025 10:27 10s
Merge pull request #1675 from pi-hole/new/debug_at_night Check for merge conflicts #1043: Commit 7acd0d4 pushed by DL6ER
December 28, 2024 11:50 2m 10s development
development
December 28, 2024 11:50 2m 10s
Bake debugging requirements into the nightly image for ease of debugging Check for merge conflicts #1042: Commit bcb4e28 pushed by DL6ER
December 28, 2024 10:45 12s new/debug_at_night
new/debug_at_night
December 28, 2024 10:45 12s
Merge pull request #1674 from pi-hole/fix/caddy Check for merge conflicts #1041: Commit bfcdafc pushed by yubiuser
December 22, 2024 19:16 2m 10s development
development
December 22, 2024 19:16 2m 10s
Pi-hole does not provide DNS-over-TLS Check for merge conflicts #1040: Commit 4a17221 pushed by yubiuser
December 22, 2024 13:42 9s fix/caddy
fix/caddy
December 22, 2024 13:42 9s
Updated the instructions to free up port 53 in Fedora Check for merge conflicts #1039: Pull request #1660 synchronize by OptimoSupreme
December 16, 2024 11:28 11s
December 16, 2024 11:28 11s
Merge pull request #1671 from pi-hole/alpine_321 Check for merge conflicts #1038: Commit 4aecdbe pushed by rdwebdesign
December 9, 2024 20:40 2m 12s development
development
December 9, 2024 20:40 2m 12s
Update base image to Alpine 3.21 Check for merge conflicts #1037: Commit 6721fa2 pushed by rdwebdesign
December 9, 2024 18:36 10s alpine_321
alpine_321
December 9, 2024 18:36 10s