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

Also make <domain> optional in the setupVars.conf migration process Check for merge conflicts #3415: Commit 3d19311 pushed by DL6ER
February 22, 2025 10:25 11s fix/revServer_migration
fix/revServer_migration
February 22, 2025 10:25 11s
Add parsing support for trailing #-comments in the dns.hosts entries Check for merge conflicts #3414: Commit 2f1ad68 pushed by DL6ER
February 22, 2025 10:05 10s tweak_dns_hosts_tabs
tweak_dns_hosts_tabs
February 22, 2025 10:05 10s
Merge pull request #2246 from pi-hole/rrobgill-development Check for merge conflicts #3413: Commit 0f2bcf3 pushed by DL6ER
February 22, 2025 09:52 2m 10s development
development
February 22, 2025 09:52 2m 10s
Make additional_headers configurable Check for merge conflicts #3412: Pull request #2236 synchronize by DL6ER
February 22, 2025 09:40 10s
February 22, 2025 09:40 10s
Add allowed values to test/pihole.toml Check for merge conflicts #3411: Commit bc6104e pushed by DL6ER
February 22, 2025 09:40 13s new/webserver_headers
new/webserver_headers
February 22, 2025 09:40 13s
Add the necessary changes in pihole.toml Check for merge conflicts #3410: Commit 4558911 pushed by DL6ER
February 22, 2025 09:21 12s rrobgill-development
rrobgill-development
February 22, 2025 09:21 12s
Fix typo in dns.showDNSSEC text description Check for merge conflicts #3409: Pull request #2209 synchronize by DL6ER
February 22, 2025 09:18 10s
February 22, 2025 09:18 10s
Make additional_headers configurable Check for merge conflicts #3408: Pull request #2236 synchronize by DL6ER
February 22, 2025 09:08 11s
February 22, 2025 09:08 11s
Allowed properties cannot be NULL for some config item types. Add a c… Check for merge conflicts #3407: Commit 10cfd31 pushed by DL6ER
February 22, 2025 09:08 11s new/webserver_headers
new/webserver_headers
February 22, 2025 09:08 11s
Make additional_headers configurable Check for merge conflicts #3406: Pull request #2236 synchronize by DL6ER
February 22, 2025 09:04 10s
February 22, 2025 09:04 10s
Allowed properties cannot be NULL for some config item types. Add a c… Check for merge conflicts #3405: Commit 23683eb pushed by DL6ER
February 22, 2025 09:04 12s new/webserver_headers
new/webserver_headers
February 22, 2025 09:04 12s
Merge pull request #2240 from pi-hole/tweak/explain_random_errs Check for merge conflicts #3404: Commit 23fd011 pushed by yubiuser
February 22, 2025 08:38 2m 12s development
development
February 22, 2025 08:38 2m 12s
Merge pull request #2244 from bennettmsherman/patch-1 Check for merge conflicts #3403: Commit 8082208 pushed by DL6ER
February 22, 2025 08:17 2m 10s development
development
February 22, 2025 08:17 2m 10s
Merge pull request #2239 from pi-hole/fix/dns_domain_docs Check for merge conflicts #3402: Commit 619d837 pushed by DL6ER
February 22, 2025 08:11 2m 10s development
development
February 22, 2025 08:11 2m 10s
Improve secure randomness generation Check for merge conflicts #3401: Pull request #2240 synchronize by DL6ER
February 22, 2025 08:10 13s
February 22, 2025 08:10 13s
Create a new randomess generating function that retries on interrupti… Check for merge conflicts #3400: Commit 633c205 pushed by DL6ER
February 22, 2025 08:10 11s tweak/explain_random_errs
tweak/explain_random_errs
February 22, 2025 08:10 11s
Clarify the role of dns.domain outside of the DHCP context Check for merge conflicts #3399: Pull request #2239 synchronize by DL6ER
February 22, 2025 08:01 11s
February 22, 2025 08:01 11s
Fix typo Check for merge conflicts #3398: Commit f8c27c2 pushed by DL6ER
February 22, 2025 08:01 11s fix/dns_domain_docs
fix/dns_domain_docs
February 22, 2025 08:01 11s
Merge pull request #2233 from pi-hole/fix/local_api_no_lo Check for merge conflicts #3397: Commit c4cb552 pushed by DL6ER
February 22, 2025 08:00 2m 10s development
development
February 22, 2025 08:00 2m 10s
Merge pull request #2238 from pi-hole/tweak/skip_no_setupVars Check for merge conflicts #3396: Commit 4554134 pushed by DL6ER
February 22, 2025 06:59 2m 9s development
development
February 22, 2025 06:59 2m 9s
Merge pull request #2243 from pi-hole/master Check for merge conflicts #3395: Commit ce95de1 pushed by PromoFaux
February 21, 2025 21:55 2m 10s development
development
February 21, 2025 21:55 2m 10s
Merge pull request #2232 from pi-hole/development Check for merge conflicts #3394: Commit ac500d5 pushed by PromoFaux
February 21, 2025 21:48 9s v6.0.2
v6.0.2
February 21, 2025 21:48 9s
Merge pull request #2232 from pi-hole/development Check for merge conflicts #3393: Commit ac500d5 pushed by PromoFaux
February 21, 2025 21:48 11s master
master
February 21, 2025 21:48 11s
Pi-hole FTL v6.0.2 Check for merge conflicts #3392: Pull request #2232 synchronize by PromoFaux
February 21, 2025 21:24 2m 12s
February 21, 2025 21:24 2m 12s
Merge pull request #2237 from pi-hole/fix/revServer_wo_domain Check for merge conflicts #3391: Commit bdbe30a pushed by PromoFaux
February 21, 2025 21:24 2m 11s development
development
February 21, 2025 21:24 2m 11s