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

[v5] Fix architecture detection for linux/386 images Check for merge conflicts #839: Pull request #1599 synchronize by PromoFaux
June 15, 2024 16:01 9s
June 15, 2024 16:01 9s
fall back to using dpkg when arch is detected as x86_64 to make sure … Check for merge conflicts #838: Commit eda9fdc pushed by PromoFaux
June 15, 2024 16:01 12s tweak/386-workaround
tweak/386-workaround
June 15, 2024 16:01 12s
fall back to using dpkg when arch is detected as x86_64 to make sure … Check for merge conflicts #837: Commit cc6967a pushed by PromoFaux
June 15, 2024 15:54 13s tweak/386-workaround
tweak/386-workaround
June 15, 2024 15:54 13s
Merge pull request #1598 from alexis-opolka/master Check for merge conflicts #836: Commit 56c110a pushed by PromoFaux
June 12, 2024 12:11 14s development-v6
development-v6
June 12, 2024 12:11 14s
Update github user reference Check for merge conflicts #835: Pull request #1598 synchronize by alexis-opolka
June 12, 2024 01:25 10s
June 12, 2024 01:25 10s
Update github user reference Check for merge conflicts #834: Pull request #1598 synchronize by alexis-opolka
June 12, 2024 01:22 11s
June 12, 2024 01:22 11s
Update github user reference Check for merge conflicts #833: Pull request #1598 synchronize by alexis-opolka
June 12, 2024 01:08 11s
June 12, 2024 01:08 11s
Update github user reference Check for merge conflicts #832: Pull request #1598 synchronize by alexis-opolka
June 11, 2024 15:09 10s
June 11, 2024 15:09 10s
Merge pull request #1597 from pi-hole/dependabot/pip/test/dev/pytest-… Check for merge conflicts #831: Commit b799ee3 pushed by yubiuser
June 8, 2024 12:33 13s dev
dev
June 8, 2024 12:33 13s
Bump pytest from 8.2.1 to 8.2.2 in /test Check for merge conflicts #830: Commit 13af8e5 pushed by dependabot bot
June 8, 2024 10:48 10s dependabot/pip/test/dev/pytest-8.2.2
dependabot/pip/test/dev/pytest-8.2.2
June 8, 2024 10:48 10s
Merge pull request #1596 from pi-hole/new/ntp Check for merge conflicts #829: Commit 80c8299 pushed by DL6ER
June 8, 2024 09:14 10s development-v6
development-v6
June 8, 2024 09:14 10s
Add CAP_SYS_TIME in the container if available Check for merge conflicts #828: Commit 63f36bf pushed by DL6ER
June 8, 2024 09:05 13s new/ntp
new/ntp
June 8, 2024 09:05 13s
Merge pull request #1594 from pi-hole/tweak/readme Check for merge conflicts #827: Commit 60d8067 pushed by PromoFaux
June 5, 2024 20:17 11s development-v6
development-v6
June 5, 2024 20:17 11s
Update DNS upstream servers in quick start compose example to use sem… Check for merge conflicts #826: Commit f34c9c8 pushed by PromoFaux
June 5, 2024 20:03 11s tweak/readme
tweak/readme
June 5, 2024 20:03 11s
Merge pull request #1593 from pi-hole/v6/readme Check for merge conflicts #825: Commit 435ab30 pushed by PromoFaux
June 2, 2024 14:53 11s development-v6
development-v6
June 2, 2024 14:53 11s
Add note about FTL reverting to default if env var is unset Check for merge conflicts #824: Commit d447890 pushed by PromoFaux
June 2, 2024 14:25 16s v6/readme
v6/readme
June 2, 2024 14:25 16s
Merge pull request #1592 from pi-hole/dependabot/pip/test/dev/pytest-… Check for merge conflicts #823: Commit ee6e970 pushed by yubiuser
June 1, 2024 11:04 9s dev
dev
June 1, 2024 11:04 9s
Merge pull request #1591 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #822: Commit 0f530a6 pushed by yubiuser
June 1, 2024 11:04 10s development-v6
development-v6
June 1, 2024 11:04 10s
Merge pull request #1590 from pi-hole/dependabot/github_actions/dev/e… Check for merge conflicts #821: Commit a641a8f pushed by yubiuser
June 1, 2024 11:01 2m 13s dev
dev
June 1, 2024 11:01 2m 13s
Bump pytest-testinfra from 10.1.0 to 10.1.1 in /test Check for merge conflicts #820: Commit 0b08884 pushed by dependabot bot
June 1, 2024 10:40 10s dependabot/pip/test/dev/pytest-testinfra-10.1.1
dependabot/pip/test/dev/pytest-testinfra-10.1.1
June 1, 2024 10:40 10s
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 Check for merge conflicts #819: Commit 42fab87 pushed by dependabot bot
June 1, 2024 10:35 8s dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.2
dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.2
June 1, 2024 10:35 8s
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 Check for merge conflicts #818: Commit 70f9bfe pushed by dependabot bot
June 1, 2024 10:26 14s dependabot/github_actions/dev/eps1lon/actions-label-merge-conflict-3.0.2
dependabot/github_actions/dev/eps1lon/actions-label-merge-conflict-3.0.2
June 1, 2024 10:26 14s
Add ENV variable for ConfigMap for adlists Check for merge conflicts #817: Pull request #1581 synchronize by gattjoe
May 31, 2024 01:22 13s
May 31, 2024 01:22 13s
Merge pull request #1589 from pi-hole/master Check for merge conflicts #816: Commit 7e5daa3 pushed by PromoFaux
May 30, 2024 12:09 10s dev
dev
May 30, 2024 12:09 10s
Merge pull request #1588 from pi-hole/dev Check for merge conflicts #815: Commit f77e922 pushed by PromoFaux
May 30, 2024 12:07 2m 9s master
master
May 30, 2024 12:07 2m 9s