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
1,765 workflow runs
1,765 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Prevent crash on failure to source secure randomness Check for merge conflicts #3490: Commit 511ddae pushed by DL6ER
February 27, 2025 18:55 10s fix/randomness_crash
fix/randomness_crash
February 27, 2025 18:55 10s
Add total CPU % to /info/system endpoint Check for merge conflicts #3489: Pull request #2297 synchronize by DL6ER
February 27, 2025 18:43 10s
February 27, 2025 18:43 10s
PADD should show total CPU % Check for merge conflicts #3488: Commit be30ef7 pushed by DL6ER
February 27, 2025 18:43 14s new/total_cpu
new/total_cpu
February 27, 2025 18:43 14s
Revert off-by-2 patch for TFP packet end in dnsmasq Check for merge conflicts #3487: Commit 6d6198c pushed by DL6ER
February 27, 2025 18:39 12s fix/dnsmasq_tftp_patch
fix/dnsmasq_tftp_patch
February 27, 2025 18:39 12s
Enable link-time optimizations Check for merge conflicts #3486: Commit c7ce20c pushed by DL6ER
February 27, 2025 18:38 14s new/lto
new/lto
February 27, 2025 18:38 14s
Add total CPU % to /info/system endpoint Check for merge conflicts #3485: Pull request #2297 synchronize by DL6ER
February 27, 2025 05:30 11s
February 27, 2025 05:30 11s
Return early if we cannot parse the total cpu line in /proc/stat Check for merge conflicts #3484: Commit b6b47f0 pushed by DL6ER
February 27, 2025 05:30 10s new/total_cpu
new/total_cpu
February 27, 2025 05:30 10s
Pi-hole FTL v6.0.3 Check for merge conflicts #3483: Pull request #2296 synchronize by DL6ER
February 27, 2025 05:09 2m 9s
February 27, 2025 05:09 2m 9s
Merge pull request #2291 from tsutsu3/fix-api-docs-put Check for merge conflicts #3482: Commit f0a4ac1 pushed by DL6ER
February 27, 2025 05:09 12s development
development
February 27, 2025 05:09 12s
Return negative total CPU % if it cannot be calculated (*very* old ke… Check for merge conflicts #3481: Commit 1102aa1 pushed by DL6ER
February 27, 2025 05:04 11s new/total_cpu
new/total_cpu
February 27, 2025 05:04 11s
Add total CPU % to /info/system endpoint Check for merge conflicts #3480: Commit 41abff8 pushed by DL6ER
February 27, 2025 04:54 10s new/total_cpu
new/total_cpu
February 27, 2025 04:54 10s
Pi-hole FTL v6.0.3 Check for merge conflicts #3479: Pull request #2296 synchronize by DL6ER
February 27, 2025 04:24 15s
February 27, 2025 04:24 15s
Merge pull request #2293 from pi-hole/fix/san_wildcard Check for merge conflicts #3478: Commit 0d8251b pushed by DL6ER
February 27, 2025 04:24 2m 11s development
development
February 27, 2025 04:24 2m 11s
fix: make get_domains parameters optional Check for merge conflicts #3477: Pull request #2278 synchronize by tien
February 27, 2025 00:21 11s
February 27, 2025 00:21 11s
fix: make get_domains parameters optional Check for merge conflicts #3476: Pull request #2278 synchronize by tien
February 27, 2025 00:18 10s
February 27, 2025 00:18 10s
fix: make get_domains parameters optional Check for merge conflicts #3475: Pull request #2278 synchronize by tien
February 26, 2025 23:45 10s
February 26, 2025 23:45 10s
Merge pull request #2295 from pi-hole/fix/restart_threads Check for merge conflicts #3474: Commit 3158465 pushed by DL6ER
February 26, 2025 17:43 2m 10s development
development
February 26, 2025 17:43 2m 10s
Restart FTL on change of webserver.threads Check for merge conflicts #3473: Commit f51f481 pushed by DL6ER
February 26, 2025 17:33 11s fix/restart_threads
fix/restart_threads
February 26, 2025 17:33 11s
Also validate env variables. They use whatever is in pihole.toml anyw… Check for merge conflicts #3472: Commit efc51ed pushed by DL6ER
February 26, 2025 17:28 13s tweak/validate_envs
tweak/validate_envs
February 26, 2025 17:28 13s
Fix off-by-one in wildcard SAN checking Check for merge conflicts #3471: Commit 0bd03ce pushed by DL6ER
February 26, 2025 17:24 9s fix/san_wildcard
fix/san_wildcard
February 26, 2025 17:24 9s
Fix status codes and response messages for PUT in API docs Check for merge conflicts #3470: Pull request #2291 synchronize by tsutsu3
February 26, 2025 15:12 11s
February 26, 2025 15:12 11s
fix: make get_domains parameters optional Check for merge conflicts #3469: Pull request #2278 synchronize by tien
February 26, 2025 02:25 12s
February 26, 2025 02:25 12s
Merge pull request #2285 from pi-hole/fix/maxHistory Check for merge conflicts #3468: Commit a0e4cc9 pushed by DL6ER
February 25, 2025 19:49 2m 11s development
development
February 25, 2025 19:49 2m 11s
Restart FTL to import more data in case of enlarging webserver.api.ma… Check for merge conflicts #3467: Commit ff9d81c pushed by DL6ER
February 25, 2025 18:34 16s fix/maxHistory
fix/maxHistory
February 25, 2025 18:34 16s
Merge pull request #2280 from rrobgill/typo Check for merge conflicts #3466: Commit 0df08a4 pushed by yubiuser
February 25, 2025 07:51 2m 13s development
development
February 25, 2025 07:51 2m 13s