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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge branch 'development' into tweak/README_v6 Check for merge conflicts #991: Commit ba5d35d pushed by rdwebdesign
September 25, 2024 16:26 11s tweak/README_v6
tweak/README_v6
September 25, 2024 16:26 11s
Correct the documentation for the TAIL_FTL_LOG variable Check for merge conflicts #990: Commit 89eb7f6 pushed by PromoFaux
September 25, 2024 14:28 2m 13s development
development
September 25, 2024 14:28 2m 13s
Merge pull request #1648 from pi-hole/dependabot/pip/test/development… Check for merge conflicts #989: Commit 5f3b829 pushed by yubiuser
September 14, 2024 10:52 2m 12s development
development
September 14, 2024 10:52 2m 12s
Bump pytest from 8.3.2 to 8.3.3 in /test Check for merge conflicts #988: Commit 3070e68 pushed by dependabot bot
September 14, 2024 10:51 10s dependabot/pip/test/development/pytest-8.3.3
dependabot/pip/test/development/pytest-8.3.3
September 14, 2024 10:51 10s
Merge pull request #1647 from IngmarStein/patch-1 Check for merge conflicts #987: Commit c020a70 pushed by yubiuser
September 14, 2024 07:55 2m 12s development
development
September 14, 2024 07:55 2m 12s
Tweak Readme text and formatting Check for merge conflicts #986: Commit a780403 pushed by rdwebdesign
September 13, 2024 19:32 14s tweak/README_v6
tweak/README_v6
September 13, 2024 19:32 14s
Add some hardening to the build script Check for merge conflicts #985: Pull request #1644 synchronize by PromoFaux
September 13, 2024 17:43 16s
September 13, 2024 17:43 16s
Add some hardening to the build script. Check if system has docker bu… Check for merge conflicts #984: Commit 5631794 pushed by PromoFaux
September 13, 2024 17:43 11s sanity-check-downloaded-FTL
sanity-check-downloaded-FTL
September 13, 2024 17:43 11s
Merge pull request #1645 from pi-hole/fix-tests Check for merge conflicts #983: Commit 4c05862 pushed by PromoFaux
September 13, 2024 17:43 2m 10s development
development
September 13, 2024 17:43 2m 10s
Fix development tests Check for merge conflicts #982: Pull request #1645 synchronize by PromoFaux
September 13, 2024 17:36 10s
September 13, 2024 17:36 10s
Clean Shutdown test: Remove check for the "Shutting down..." line in … Check for merge conflicts #981: Commit af8863a pushed by PromoFaux
September 13, 2024 17:36 10s fix-tests
fix-tests
September 13, 2024 17:36 10s
Fix development tests Check for merge conflicts #980: Pull request #1645 synchronize by PromoFaux
September 13, 2024 17:27 10s
September 13, 2024 17:27 10s
Clean Shutdown test: Remove check for the "Shutting down..." line in … Check for merge conflicts #979: Commit 357a6cb pushed by PromoFaux
September 13, 2024 17:27 10s fix-tests
fix-tests
September 13, 2024 17:27 10s
Clean Shutdown test: Remove check for the "Shutting down..." line in … Check for merge conflicts #978: Commit ead9c18 pushed by PromoFaux
September 13, 2024 17:23 11s fix-tests
fix-tests
September 13, 2024 17:23 11s
Add some hardening to the build script Check for merge conflicts #977: Pull request #1644 synchronize by PromoFaux
September 13, 2024 16:54 10s
September 13, 2024 16:54 10s
Add some hardening to the build script. Check if system has docker bu… Check for merge conflicts #976: Commit a200625 pushed by PromoFaux
September 13, 2024 16:54 14s sanity-check-downloaded-FTL
sanity-check-downloaded-FTL
September 13, 2024 16:54 14s
Add some hardening to the build script Check for merge conflicts #975: Pull request #1644 synchronize by PromoFaux
September 11, 2024 21:52 9s
September 11, 2024 21:52 9s
Add some hardening to the build script. Check if system has docker bu… Check for merge conflicts #974: Commit 1b0c41d pushed by PromoFaux
September 11, 2024 21:52 9s sanity-check-downloaded-FTL
sanity-check-downloaded-FTL
September 11, 2024 21:52 9s
Add some hardening to the build script Check for merge conflicts #973: Pull request #1644 synchronize by PromoFaux
September 11, 2024 21:49 13s
September 11, 2024 21:49 13s
Add some hardening to the build script. Check if system has docker bu… Check for merge conflicts #972: Commit c710042 pushed by PromoFaux
September 11, 2024 21:49 9s sanity-check-downloaded-FTL
sanity-check-downloaded-FTL
September 11, 2024 21:49 9s
Add some hardening to the build script. Check if system has docker bu… Check for merge conflicts #971: Commit 476ed10 pushed by PromoFaux
September 11, 2024 21:24 11s sanity-check-downloaded-FTL
sanity-check-downloaded-FTL
September 11, 2024 21:24 11s
Merge pull request #1643 from pi-hole/sanity-check-downloaded-FTL Check for merge conflicts #970: Commit 3454f65 pushed by PromoFaux
September 11, 2024 20:11 13s development
development
September 11, 2024 20:11 13s
Confirm validity of downloaded FTL binary when building Check for merge conflicts #969: Pull request #1643 synchronize by PromoFaux
September 11, 2024 18:13 11s
September 11, 2024 18:13 11s
Actually do something with the result of readelf in case of invalid… Check for merge conflicts #968: Commit e938d1a pushed by PromoFaux
September 11, 2024 18:13 11s sanity-check-downloaded-FTL
sanity-check-downloaded-FTL
September 11, 2024 18:13 11s
Actually do something with the result of readelf in case of invalid… Check for merge conflicts #967: Commit f10a3b9 pushed by PromoFaux
September 11, 2024 18:01 10s sanity-check-downloaded-FTL
sanity-check-downloaded-FTL
September 11, 2024 18:01 10s