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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update alpine to 3.19 Check for merge conflicts #647: Pull request #1497 synchronize by yubiuser
December 17, 2023 12:42 14s
December 17, 2023 12:42 14s
Re-add importand comment line Check for merge conflicts #646: Commit 5f8ca18 pushed by yubiuser
December 17, 2023 12:42 9s alpine3_19
alpine3_19
December 17, 2023 12:42 9s
Update alpine to 3.19 Check for merge conflicts #645: Pull request #1497 synchronize by yubiuser
December 17, 2023 12:38 12s
December 17, 2023 12:38 12s
Remove pipenv and allow pip to install systemwide with --break-system… Check for merge conflicts #644: Commit 59cfc75 pushed by yubiuser
December 17, 2023 12:38 9s alpine3_19
alpine3_19
December 17, 2023 12:38 9s
Update alpine to 3.19 Check for merge conflicts #643: Pull request #1497 synchronize by yubiuser
December 16, 2023 22:33 10s
December 16, 2023 22:33 10s
Install pipenv as --user instead of --system Check for merge conflicts #642: Commit 624eff6 pushed by yubiuser
December 16, 2023 22:33 10s alpine3_19
alpine3_19
December 16, 2023 22:33 10s
Update alpine to 3.19 Check for merge conflicts #641: Pull request #1497 synchronize by yubiuser
December 16, 2023 22:23 13s
December 16, 2023 22:23 13s
Update docker-cli also to v3.19 Check for merge conflicts #640: Commit 775c3a8 pushed by yubiuser
December 16, 2023 22:23 11s alpine3_19
alpine3_19
December 16, 2023 22:23 11s
Bump actions/upload-artifact from 3 to 4 Check for merge conflicts #639: Pull request #1505 synchronize by dependabot bot
December 16, 2023 21:06 13s
December 16, 2023 21:06 13s
Bump actions/upload-artifact from 3 to 4 Check for merge conflicts #638: Commit 4f752c6 pushed by dependabot bot
December 16, 2023 21:06 13s dependabot/github_actions/development-v6/actions/upload-artifact-4
dependabot/github_actions/development-v6/actions/upload-artifact-4
December 16, 2023 21:06 13s
Merge pull request #1501 from pi-hole/dependabot/pip/test/dev/black-2… Check for merge conflicts #637: Commit 44da50b pushed by yubiuser
December 16, 2023 16:41 2m 10s dev
dev
December 16, 2023 16:41 2m 10s
Merge pull request #1502 from pi-hole/dependabot/pip/test/development… Check for merge conflicts #636: Commit da2acb7 pushed by yubiuser
December 16, 2023 16:40 2m 11s development-v6
development-v6
December 16, 2023 16:40 2m 11s
Bump actions/download-artifact from 3 to 4 Check for merge conflicts #635: Commit 528c137 pushed by dependabot bot
December 16, 2023 10:26 12s dependabot/github_actions/development-v6/actions/download-artifact-4
dependabot/github_actions/development-v6/actions/download-artifact-4
December 16, 2023 10:26 12s
Bump actions/upload-artifact from 3 to 4 Check for merge conflicts #634: Commit c54237c pushed by dependabot bot
December 16, 2023 10:26 12s dependabot/github_actions/development-v6/actions/upload-artifact-4
dependabot/github_actions/development-v6/actions/upload-artifact-4
December 16, 2023 10:26 12s
Bump actions/upload-artifact from 3 to 4 Check for merge conflicts #633: Commit 43d929b pushed by dependabot bot
December 16, 2023 10:21 11s dependabot/github_actions/dev/actions/upload-artifact-4
dependabot/github_actions/dev/actions/upload-artifact-4
December 16, 2023 10:21 11s
Bump actions/download-artifact from 3 to 4 Check for merge conflicts #632: Commit 8c32045 pushed by dependabot bot
December 16, 2023 10:21 12s dependabot/github_actions/dev/actions/download-artifact-4
dependabot/github_actions/dev/actions/download-artifact-4
December 16, 2023 10:21 12s
Bump black from 23.11.0 to 23.12.0 in /test Check for merge conflicts #631: Commit 0290369 pushed by dependabot bot
December 16, 2023 10:18 9s dependabot/pip/test/development-v6/black-23.12.0
dependabot/pip/test/development-v6/black-23.12.0
December 16, 2023 10:18 9s
Bump black from 23.11.0 to 23.12.0 in /test Check for merge conflicts #630: Commit fff38bd pushed by dependabot bot
December 16, 2023 10:10 10s dependabot/pip/test/dev/black-23.12.0
dependabot/pip/test/dev/black-23.12.0
December 16, 2023 10:10 10s
Enhance theme validation Check for merge conflicts #629: Pull request #1500 synchronize by ADawidowski
December 10, 2023 21:31 9s
December 10, 2023 21:31 9s
Update alpine to 3.19 Check for merge conflicts #628: Pull request #1497 synchronize by yubiuser
December 9, 2023 13:30 13s
December 9, 2023 13:30 13s
Update alpine to 3.19 Check for merge conflicts #627: Commit ecb4c5c pushed by yubiuser
December 9, 2023 13:30 9s alpine3_19
alpine3_19
December 9, 2023 13:30 9s
Merge pull request #1498 from pi-hole/dependabot/github_actions/devel… Check for merge conflicts #626: Commit d1ca7ff pushed by yubiuser
December 9, 2023 11:44 2m 11s development-v6
development-v6
December 9, 2023 11:44 2m 11s
Merge pull request #1499 from pi-hole/dependabot/github_actions/dev/a… Check for merge conflicts #625: Commit 401d9f2 pushed by yubiuser
December 9, 2023 11:42 2m 10s dev
dev
December 9, 2023 11:42 2m 10s
Bump actions/stale from 8.0.0 to 9.0.0 Check for merge conflicts #624: Commit 88b0a7c pushed by dependabot bot
December 9, 2023 10:37 14s dependabot/github_actions/dev/actions/stale-9.0.0
dependabot/github_actions/dev/actions/stale-9.0.0
December 9, 2023 10:37 14s
Bump actions/stale from 8.0.0 to 9.0.0 Check for merge conflicts #623: Commit 8fc242c pushed by dependabot bot
December 9, 2023 10:36 11s dependabot/github_actions/development-v6/actions/stale-9.0.0
dependabot/github_actions/development-v6/actions/stale-9.0.0
December 9, 2023 10:36 11s
ProTip! You can narrow down the results and go further in time using created:<2023-12-09 or the other filters available.