Skip to content

Actions: pi-hole/web

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
63 workflow run results
63 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Alternate 404 Error Page Based on @DL6ER Check for merge conflicts #893: Pull request #2748 synchronize by NittanySeaLion
October 14, 2023 23:39 15s
October 14, 2023 23:39 15s
Alternate 404 Error Page Based on @DL6ER Check for merge conflicts #892: Pull request #2748 synchronize by NittanySeaLion
October 14, 2023 23:32 14s
October 14, 2023 23:32 14s
Alternate 404 Error Page Based on @DL6ER Check for merge conflicts #891: Pull request #2748 synchronize by NittanySeaLion
October 14, 2023 23:29 10s
October 14, 2023 23:29 10s
Alternate 404 Error Page Based on @DL6ER Check for merge conflicts #890: Pull request #2748 synchronize by NittanySeaLion
October 14, 2023 20:49 19s
October 14, 2023 20:49 19s
Alternate 404 Error Page Based on @DL6ER Check for merge conflicts #889: Pull request #2748 synchronize by NittanySeaLion
October 14, 2023 20:46 13s
October 14, 2023 20:46 13s
Tweak and fix the update footer Check for merge conflicts #888: Pull request #2745 synchronize by yubiuser
October 14, 2023 20:27 12s
October 14, 2023 20:27 12s
Add a space Check for merge conflicts #887: Commit 8ccc66d pushed by yubiuser
October 14, 2023 20:27 10s tweak/update_footer
tweak/update_footer
October 14, 2023 20:27 10s
Alternate 404 Error Page Based on @DL6ER Check for merge conflicts #886: Pull request #2748 synchronize by NittanySeaLion
October 14, 2023 20:26 11s
October 14, 2023 20:26 11s
Alternate 404 Error Page Based on @DL6ER Check for merge conflicts #885: Pull request #2748 synchronize by NittanySeaLion
October 14, 2023 20:25 11s
October 14, 2023 20:25 11s
It's empty, not null Check for merge conflicts #883: Commit 9ea844f pushed by yubiuser
October 14, 2023 18:09 16s tweak/update_footer
tweak/update_footer
October 14, 2023 18:09 16s
Tweak and fix the update footer Check for merge conflicts #884: Pull request #2745 synchronize by yubiuser
October 14, 2023 18:09 14s
October 14, 2023 18:09 14s
Tweak and fix the update footer Check for merge conflicts #882: Pull request #2745 synchronize by yubiuser
October 14, 2023 18:01 11s
October 14, 2023 18:01 11s
FIx link Check for merge conflicts #881: Commit c992b00 pushed by yubiuser
October 14, 2023 18:01 14s tweak/update_footer
tweak/update_footer
October 14, 2023 18:01 14s
Tweak and fix the update footer Check for merge conflicts #880: Pull request #2745 synchronize by yubiuser
October 14, 2023 18:00 12s
October 14, 2023 18:00 12s
Do not assume update if remote hash is empty Check for merge conflicts #879: Commit 506bca3 pushed by yubiuser
October 14, 2023 18:00 14s tweak/update_footer
tweak/update_footer
October 14, 2023 18:00 14s
Add ability to specify domains, lists, clients and group names as arrays Check for merge conflicts #878: Pull request #2707 synchronize by DL6ER
October 14, 2023 14:23 12s
October 14, 2023 14:23 12s
Merge branch 'development-v6' into tweak/domain_array Check for merge conflicts #877: Commit 4020177 pushed by DL6ER
October 14, 2023 14:23 14s tweak/domain_array
tweak/domain_array
October 14, 2023 14:23 14s
Add 404 error page Check for merge conflicts #876: Commit 1159824 pushed by DL6ER
October 14, 2023 14:04 11s new/error_pages
new/error_pages
October 14, 2023 14:04 11s
Tweak and fix the update footer Check for merge conflicts #874: Pull request #2745 synchronize by yubiuser
October 14, 2023 13:27 16s
October 14, 2023 13:27 16s
Fix and tweak footer Check for merge conflicts #875: Commit d544473 pushed by yubiuser
October 14, 2023 13:27 10s tweak/update_footer
tweak/update_footer
October 14, 2023 13:27 10s
Tweak and fix the update footer Check for merge conflicts #873: Pull request #2745 synchronize by yubiuser
October 14, 2023 13:19 11s
October 14, 2023 13:19 11s
Fix and tweak footer Check for merge conflicts #872: Commit 9f9f04d pushed by yubiuser
October 14, 2023 13:19 10s tweak/update_footer
tweak/update_footer
October 14, 2023 13:19 10s
Tweak and fix the update footer Check for merge conflicts #871: Pull request #2745 synchronize by yubiuser
October 14, 2023 13:17 15s
October 14, 2023 13:17 15s
Fix and tweak footer Check for merge conflicts #870: Commit 681ca3d pushed by yubiuser
October 14, 2023 13:17 12s tweak/update_footer
tweak/update_footer
October 14, 2023 13:17 12s
Fix and tweak footer Check for merge conflicts #869: Commit 5c47ab5 pushed by yubiuser
October 14, 2023 13:16 14s tweak/update_footer
tweak/update_footer
October 14, 2023 13:16 14s