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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #2265 from pi-hole/fix/v5_v6_hosts_cnameRecords Check for merge conflicts #3440: Commit 22175ec pushed by DL6ER
February 23, 2025 20:12 2m 13s development
development
February 23, 2025 20:12 2m 13s
Merge pull request #2258 from pi-hole/tweak/rate_limit_ntp Check for merge conflicts #3439: Commit 4e66f43 pushed by DL6ER
February 23, 2025 20:06 2m 12s development
development
February 23, 2025 20:06 2m 12s
Wipe out possibly existing entries in dns.hosts, dns.cnameRecords, an… Check for merge conflicts #3438: Commit 7e47e30 pushed by DL6ER
February 23, 2025 19:07 10s fix/v5_v6_hosts_cnameRecords
fix/v5_v6_hosts_cnameRecords
February 23, 2025 19:07 10s
Rate-limit internal NTP server Check for merge conflicts #3437: Pull request #2258 synchronize by DL6ER
February 23, 2025 18:39 9s
February 23, 2025 18:39 9s
Set socket receive buffer to 1 KB to avoid (near) endless queueing of… Check for merge conflicts #3436: Commit 5bdbde0 pushed by DL6ER
February 23, 2025 18:39 12s tweak/rate_limit_ntp
tweak/rate_limit_ntp
February 23, 2025 18:39 12s
Merge pull request #2264 from MichaIng/fix/migration Check for merge conflicts #3435: Commit af775e5 pushed by DL6ER
February 23, 2025 18:29 2m 10s development
development
February 23, 2025 18:29 2m 10s
Do not allow more than 10 NTP requests per second to be served Check for merge conflicts #3434: Commit 0d077a5 pushed by DL6ER
February 22, 2025 21:54 12s tweak/rate_limit_ntp
tweak/rate_limit_ntp
February 22, 2025 21:54 12s
Merge pull request #2236 from pi-hole/new/webserver_headers Check for merge conflicts #3433: Commit 39a852e pushed by DL6ER
February 22, 2025 21:53 13s tweak/rate_limit_ntp
tweak/rate_limit_ntp
February 22, 2025 21:53 13s
Merge pull request #2236 from pi-hole/new/webserver_headers Check for merge conflicts #3432: Commit 39a852e pushed by DL6ER
February 22, 2025 21:50 2m 11s development
development
February 22, 2025 21:50 2m 11s
Make additional_headers configurable Check for merge conflicts #3431: Pull request #2236 synchronize by DL6ER
February 22, 2025 21:36 12s
February 22, 2025 21:36 12s
Free previously allocated JSON array only if element exists in TOML file Check for merge conflicts #3430: Commit 814a268 pushed by DL6ER
February 22, 2025 21:36 9s new/webserver_headers
new/webserver_headers
February 22, 2025 21:36 9s
Update config/env.c to accept conventional environment variables in a… Check for merge conflicts #3429: Pull request #2256 synchronize by iain-henderson
February 22, 2025 21:32 10s
February 22, 2025 21:32 10s
Merge pull request #2254 from pi-hole/tweak/local_api_ftl Check for merge conflicts #3428: Commit e2297ea pushed by DL6ER
February 22, 2025 18:43 2m 10s development
development
February 22, 2025 18:43 2m 10s
Make additional_headers configurable Check for merge conflicts #3427: Pull request #2236 synchronize by DL6ER
February 22, 2025 18:41 10s
February 22, 2025 18:41 10s
Instead of a long string, webserver.headers should be a list of indiv… Check for merge conflicts #3426: Commit 7ce1ef5 pushed by DL6ER
February 22, 2025 18:41 10s new/webserver_headers
new/webserver_headers
February 22, 2025 18:41 10s
Make additional_headers configurable Check for merge conflicts #3425: Pull request #2236 synchronize by DL6ER
February 22, 2025 18:07 9s
February 22, 2025 18:07 9s
Instead of a long string, webserver.headers should be a list of indiv… Check for merge conflicts #3424: Commit 1089471 pushed by DL6ER
February 22, 2025 18:07 10s new/webserver_headers
new/webserver_headers
February 22, 2025 18:07 10s
Tweak CHAOS TXT local.api.ftl Check for merge conflicts #3423: Pull request #2254 synchronize by DL6ER
February 22, 2025 17:50 10s
February 22, 2025 17:50 10s
Adjust tests Check for merge conflicts #3422: Commit 62676f3 pushed by DL6ER
February 22, 2025 17:50 9s tweak/local_api_ftl
tweak/local_api_ftl
February 22, 2025 17:50 9s
Use really bound-to IP addresses in CHAOS TXT local.api.ftl Check for merge conflicts #3421: Commit 7dab630 pushed by DL6ER
February 22, 2025 17:38 13s tweak/local_api_ftl
tweak/local_api_ftl
February 22, 2025 17:38 13s
Make additional_headers configurable Check for merge conflicts #3420: Pull request #2236 synchronize by DL6ER
February 22, 2025 11:18 12s
February 22, 2025 11:18 12s
Restart FTL on change of webserver.headers Check for merge conflicts #3419: Commit a53a357 pushed by DL6ER
February 22, 2025 11:18 10s new/webserver_headers
new/webserver_headers
February 22, 2025 11:18 10s
Merge pull request #2248 from pi-hole/fix/revServer_migration Check for merge conflicts #3418: Commit 4c4dd88 pushed by DL6ER
February 22, 2025 10:59 2m 11s development
development
February 22, 2025 10:59 2m 11s
Also make <domain> optional in the setupVars.conf migration process Check for merge conflicts #3417: Commit 5bcd1a0 pushed by DL6ER
February 22, 2025 10:31 10s fix/revServer_migration
fix/revServer_migration
February 22, 2025 10:31 10s
Merge pull request #2247 from pi-hole/tweak_dns_hosts_tabs Check for merge conflicts #3416: Commit 41ae9d4 pushed by DL6ER
February 22, 2025 10:28 2m 11s development
development
February 22, 2025 10:28 2m 11s