Skip to content

Actions: pi-hole/FTL

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
2,165 workflow runs
2,165 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update/rapidoc Check for merge conflicts #2874: Pull request #2075 synchronize by yubiuser
October 1, 2024 18:04 11s
October 1, 2024 18:04 11s
Update rapidoc Check for merge conflicts #2873: Commit 6fb223e pushed by yubiuser
October 1, 2024 18:04 13s update/rapidoc
update/rapidoc
October 1, 2024 18:04 13s
Merge pull request #2072 from pi-hole/new/verify Check for merge conflicts #2872: Commit 6c0c875 pushed by DL6ER
October 1, 2024 04:56 2m 11s development
development
October 1, 2024 04:56 2m 11s
Review comment extending documentation Check for merge conflicts #2871: Commit dec2c8a pushed by DL6ER
September 30, 2024 19:34 12s new/verify
new/verify
September 30, 2024 19:34 12s
Verify FTL binary integrity Check for merge conflicts #2870: Pull request #2072 synchronize by DL6ER
September 30, 2024 19:34 13s
September 30, 2024 19:34 13s
Update rapidoc Check for merge conflicts #2869: Commit 794aa33 pushed by yubiuser
September 30, 2024 18:30 20s update/rapidoc
update/rapidoc
September 30, 2024 18:30 20s
Verify FTL binary integrity Check for merge conflicts #2868: Pull request #2072 synchronize by DL6ER
September 30, 2024 17:37 16s
September 30, 2024 17:37 16s
Simplify text Check for merge conflicts #2867: Commit 8d1394d pushed by DL6ER
September 30, 2024 17:37 12s new/verify
new/verify
September 30, 2024 17:37 12s
Verify FTL binary integrity Check for merge conflicts #2866: Pull request #2072 synchronize by DL6ER
September 29, 2024 09:02 8s
September 29, 2024 09:02 8s
Simplify text Check for merge conflicts #2865: Commit fbfd337 pushed by DL6ER
September 29, 2024 09:02 11s new/verify
new/verify
September 29, 2024 09:02 11s
Verify FTL binary integrity Check for merge conflicts #2864: Pull request #2072 synchronize by DL6ER
September 29, 2024 08:41 10s
September 29, 2024 08:41 10s
Remove sha256 --skip-end feature as discussed during PR review process Check for merge conflicts #2863: Commit 450964e pushed by DL6ER
September 29, 2024 08:41 17s new/verify
new/verify
September 29, 2024 08:41 17s
Verify FTL binary integrity Check for merge conflicts #2862: Pull request #2072 synchronize by DL6ER
September 29, 2024 08:40 10s
September 29, 2024 08:40 10s
Remove sha256 --skip-end feature as discussed during PR review process Check for merge conflicts #2861: Commit 1b013d2 pushed by DL6ER
September 29, 2024 08:40 12s new/verify
new/verify
September 29, 2024 08:40 12s
Merge pull request #2073 from pi-hole/fix/piholePTR Check for merge conflicts #2860: Commit d749dff pushed by DL6ER
September 27, 2024 08:07 11s development
development
September 27, 2024 08:07 11s
Merge pull request #2074 from pi-hole/fix/query_log_blocked_cached Check for merge conflicts #2859: Commit a52eb0c pushed by DL6ER
September 26, 2024 18:12 2m 15s development
development
September 26, 2024 18:12 2m 15s
Do not take the not-filtered shortcut if one of the magic upstream={b… Check for merge conflicts #2858: Commit e62e586 pushed by DL6ER
September 26, 2024 17:26 15s fix/query_log_blocked_cached
fix/query_log_blocked_cached
September 26, 2024 17:26 15s
Restart FTL to enforce flushing the cache when dns.piholePTR is changed Check for merge conflicts #2857: Pull request #2073 synchronize by DL6ER
September 26, 2024 16:51 11s
September 26, 2024 16:51 11s
Restart FTL to enforce flushing the cache when dns.piholePTR is changed Check for merge conflicts #2856: Commit c2a2df8 pushed by DL6ER
September 26, 2024 16:51 28s fix/piholePTR
fix/piholePTR
September 26, 2024 16:51 28s
Restart FTL to enforce flushing the cache when dns.piholePTR is changed Check for merge conflicts #2855: Commit 89a6c24 pushed by DL6ER
September 26, 2024 16:19 12s fix/piholePTR
fix/piholePTR
September 26, 2024 16:19 12s
Add verification CI test Check for merge conflicts #2854: Commit cdba28e pushed by DL6ER
September 26, 2024 09:58 10s new/verify
new/verify
September 26, 2024 09:58 10s
Add message table entry on binary verification failure Check for merge conflicts #2853: Commit 3ca04ac pushed by DL6ER
September 26, 2024 09:43 13s new/verify
new/verify
September 26, 2024 09:43 13s
Merge pull request #2071 from pi-hole/tweak/api_regex_count Check for merge conflicts #2852: Commit cb8e8b0 pushed by DL6ER
September 25, 2024 11:03 12s development
development
September 25, 2024 11:03 12s
Disentangle info/ftl : ftl.database.domains from newly added ftl.data… Check for merge conflicts #2851: Commit 92e2590 pushed by DL6ER
September 25, 2024 08:06 21s tweak/api_regex_count
tweak/api_regex_count
September 25, 2024 08:06 21s
Merge pull request #2067 from pi-hole/tweak/db_counter_update Check for merge conflicts #2850: Commit 361e0ce pushed by DL6ER
September 25, 2024 07:29 14s development
development
September 25, 2024 07:29 14s