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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump black from 23.12.1 to 24.1.0 in /test Check for merge conflicts #699: Commit 119ae73 pushed by dependabot bot
January 27, 2024 10:57 10s dependabot/pip/test/dev/black-24.1.0
dependabot/pip/test/dev/black-24.1.0
January 27, 2024 10:57 10s
Merge pull request #1529 from pi-hole/builder_fontend Check for merge conflicts #698: Commit 2cabcc6 pushed by PromoFaux
January 12, 2024 19:19 2m 14s development-v6
development-v6
January 12, 2024 19:19 2m 14s
Add dockerfile frontend synatax line Check for merge conflicts #697: Commit 24090b2 pushed by yubiuser
January 10, 2024 12:49 11s builder_fontend
builder_fontend
January 10, 2024 12:49 11s
Update the v6 workflow in the master branch so that the nightly conti… Check for merge conflicts #696: Commit b9ca401 pushed by PromoFaux
January 9, 2024 17:44 11s master
master
January 9, 2024 17:44 11s
Merge pull request #1527 from pi-hole/v6/fix-actions-finally Check for merge conflicts #695: Commit ae7ea35 pushed by PromoFaux
January 7, 2024 21:57 2m 10s development-v6
development-v6
January 7, 2024 21:57 2m 10s
Simplify build and publish action for v6 Check for merge conflicts #694: Pull request #1527 synchronize by PromoFaux
January 7, 2024 20:24 11s
January 7, 2024 20:24 11s
Simplify build and publish action for v6. No need to have an addition… Check for merge conflicts #693: Commit d3bb3bd pushed by PromoFaux
January 7, 2024 20:24 11s v6/fix-actions-finally
v6/fix-actions-finally
January 7, 2024 20:24 11s
Simplify build and publish action for v6. No need to have an addition… Check for merge conflicts #692: Commit eb8ba45 pushed by PromoFaux
January 7, 2024 14:36 10s v6/fix-actions-finally
v6/fix-actions-finally
January 7, 2024 14:36 10s
Simplify build matrix and fix digests Check for merge conflicts #691: Commit 0ae5b0b pushed by PromoFaux
January 7, 2024 14:35 10s v6/fix-actions-finally
v6/fix-actions-finally
January 7, 2024 14:35 10s
Merge pull request #1526 from pi-hole/registry_digest Check for merge conflicts #690: Commit 50b8c64 pushed by PromoFaux
January 7, 2024 13:13 2m 11s development-v6
development-v6
January 7, 2024 13:13 2m 11s
Merge pull request #1472 from pi-hole/tweak/dependabot Check for merge conflicts #689: Commit 184b8bb pushed by PromoFaux
January 7, 2024 08:08 12s 2024.01.0
2024.01.0
January 7, 2024 08:08 12s
Consider registry when up/downloading artifacts Check for merge conflicts #688: Commit f4f91f7 pushed by yubiuser
January 6, 2024 20:31 11s registry_digest
registry_digest
January 6, 2024 20:31 11s
Merge pull request #1517 from pi-hole/artifacts Check for merge conflicts #687: Commit 0c9e8ee pushed by yubiuser
January 6, 2024 12:27 2m 12s development-v6
development-v6
January 6, 2024 12:27 2m 12s
Artifacts v4 Check for merge conflicts #686: Pull request #1517 synchronize by yubiuser
January 6, 2024 12:21 11s
January 6, 2024 12:21 11s
Use ${{ env.PLATFORM_PAIR }} Check for merge conflicts #685: Commit 0ba8648 pushed by yubiuser
January 6, 2024 12:21 13s artifacts
artifacts
January 6, 2024 12:21 13s
Merge pull request #1525 from pi-hole/dependabot/pip/test/dev/pytest-… Check for merge conflicts #684: Commit 232a1fc pushed by yubiuser
January 6, 2024 11:27 2m 12s dev
dev
January 6, 2024 11:27 2m 12s
Bump pytest from 7.4.3 to 7.4.4 in /test Check for merge conflicts #683: Commit e4a6a8c pushed by dependabot bot
January 6, 2024 10:31 10s dependabot/pip/test/dev/pytest-7.4.4
dependabot/pip/test/dev/pytest-7.4.4
January 6, 2024 10:31 10s
Artifacts v4 Check for merge conflicts #682: Pull request #1517 synchronize by yubiuser
January 3, 2024 21:45 13s
January 3, 2024 21:45 13s
Simplify up/download Check for merge conflicts #681: Commit d0f321b pushed by yubiuser
January 3, 2024 21:45 16s artifacts
artifacts
January 3, 2024 21:45 16s
Bump actions/download-artifact from 3 to 4 Check for merge conflicts #680: Commit 2d9856e pushed by dependabot bot
December 30, 2023 10:51 9s dependabot/github_actions/development-v6/actions/download-artifact-4
dependabot/github_actions/development-v6/actions/download-artifact-4
December 30, 2023 10:51 9s
Bump actions/upload-artifact from 3 to 4 Check for merge conflicts #679: Commit 6f36d47 pushed by dependabot bot
December 30, 2023 10:51 10s dependabot/github_actions/development-v6/actions/upload-artifact-4
dependabot/github_actions/development-v6/actions/upload-artifact-4
December 30, 2023 10:51 10s
Bump actions/upload-artifact from 3 to 4 Check for merge conflicts #678: Commit 1a052e8 pushed by dependabot bot
December 30, 2023 10:40 9s dependabot/github_actions/dev/actions/upload-artifact-4
dependabot/github_actions/dev/actions/upload-artifact-4
December 30, 2023 10:40 9s
Bump actions/download-artifact from 3 to 4 Check for merge conflicts #677: Commit 8052ab5 pushed by dependabot bot
December 30, 2023 10:40 12s dependabot/github_actions/dev/actions/download-artifact-4
dependabot/github_actions/dev/actions/download-artifact-4
December 30, 2023 10:40 12s
Adjust workflow to run with artifacts v4 Check for merge conflicts #676: Commit 03a0379 pushed by yubiuser
December 23, 2023 20:52 10s artifacts
artifacts
December 23, 2023 20:52 10s
Merge pull request #1500 from ADawidowski/enhance_webtheme_validation Check for merge conflicts #675: Commit f400bef pushed by PromoFaux
December 23, 2023 16:20 2m 12s dev
dev
December 23, 2023 16:20 2m 12s
ProTip! You can narrow down the results and go further in time using created:<2023-12-23 or the other filters available.