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

Pi-hole FTL v6.0.2 Check for merge conflicts #3390: Pull request #2232 synchronize by PromoFaux
February 21, 2025 21:24 11s
February 21, 2025 21:24 11s
Merge pull request #2218 from pi-hole/tweak/file_locking Check for merge conflicts #3389: Commit b3af79f pushed by PromoFaux
February 21, 2025 21:24 2m 11s development
development
February 21, 2025 21:24 2m 11s
Increase compatibility with volumes on network shares Check for merge conflicts #3388: Pull request #2218 synchronize by DL6ER
February 21, 2025 20:28 12s
February 21, 2025 20:28 12s
inability to create/release exclusive logs should be warnings as they… Check for merge conflicts #3387: Commit 1d37552 pushed by DL6ER
February 21, 2025 20:28 12s tweak/file_locking
tweak/file_locking
February 21, 2025 20:28 12s
Pi-hole FTL v6.0.2 Check for merge conflicts #3386: Pull request #2232 synchronize by DL6ER
February 21, 2025 20:24 2m 11s
February 21, 2025 20:24 2m 11s
Merge pull request #2231 from pi-hole/fix/echild Check for merge conflicts #3385: Commit f75b831 pushed by DL6ER
February 21, 2025 20:24 2m 14s development
development
February 21, 2025 20:24 2m 14s
Pi-hole FTL v6.0.2 Check for merge conflicts #3384: Pull request #2232 synchronize by DL6ER
February 21, 2025 15:46 9s
February 21, 2025 15:46 9s
Merge pull request #2241 from pi-hole/update/dnsmasq Check for merge conflicts #3383: Commit dd2547a pushed by DL6ER
February 21, 2025 15:46 2m 10s development
development
February 21, 2025 15:46 2m 10s
Update dnsmasq tag to 2.91rc5 Check for merge conflicts #3382: Commit cca345b pushed by DL6ER
February 21, 2025 15:36 11s update/dnsmasq
update/dnsmasq
February 21, 2025 15:36 11s
Bump the npm-dependencies group with 2 updates Check for merge conflicts #3381: Pull request #2224 synchronize by yubiuser
February 21, 2025 13:57 12s
February 21, 2025 13:57 12s
Fix OpenAPI examples Check for merge conflicts #3380: Commit ec73bd8 pushed by yubiuser
February 21, 2025 13:57 14s dependabot-npm_and_yarn-development-npm-dependencies-c947a1b127
dependabot-npm_and_yarn-development-npm-dependencies-c947a1b127
February 21, 2025 13:57 14s
Bump the npm-dependencies group with 2 updates Check for merge conflicts #3379: Pull request #2224 synchronize by yubiuser
February 21, 2025 13:38 10s
February 21, 2025 13:38 10s
Exclude package-lock.json from codespell Check for merge conflicts #3378: Commit feead92 pushed by yubiuser
February 21, 2025 13:38 11s dependabot-npm_and_yarn-development-npm-dependencies-c947a1b127
dependabot-npm_and_yarn-development-npm-dependencies-c947a1b127
February 21, 2025 13:38 11s
Bump the npm-dependencies group with 2 updates Check for merge conflicts #3377: Pull request #2224 synchronize by yubiuser
February 21, 2025 13:35 15s
February 21, 2025 13:35 15s
Exclude package-lock.json from codespell Check for merge conflicts #3376: Commit e9d49f5 pushed by yubiuser
February 21, 2025 13:35 15s dependabot-npm_and_yarn-development-npm-dependencies-c947a1b127
dependabot-npm_and_yarn-development-npm-dependencies-c947a1b127
February 21, 2025 13:35 15s
Simplify final EDNS manipulation step Check for merge conflicts #3375: Commit a38dce5 pushed by DL6ER
February 21, 2025 12:34 10s update/dnsmasq
update/dnsmasq
February 21, 2025 12:34 10s
Create a new randomess generating function that retries on interrupti… Check for merge conflicts #3374: Commit 3b18aca pushed by DL6ER
February 21, 2025 11:34 12s tweak/explain_random_errs
tweak/explain_random_errs
February 21, 2025 11:34 12s
Do not try to migrate setupVars.conf if it does not exist. Check for merge conflicts #3373: Pull request #2238 synchronize by DL6ER
February 21, 2025 11:03 13s
February 21, 2025 11:03 13s
Return early if no setupVars.conf is found Check for merge conflicts #3372: Commit 8857659 pushed by DL6ER
February 21, 2025 11:03 11s tweak/skip_no_setupVars
tweak/skip_no_setupVars
February 21, 2025 11:03 11s
Clarify the role of dns.domain outside of the DHCP context Check for merge conflicts #3371: Commit 0c1eced pushed by DL6ER
February 21, 2025 11:00 12s fix/dns_domain_docs
fix/dns_domain_docs
February 21, 2025 11:00 12s
Return early if no setupVars.conf is found Check for merge conflicts #3370: Commit cd37f81 pushed by DL6ER
February 21, 2025 10:34 9s tweak/skip_no_setupVars
tweak/skip_no_setupVars
February 21, 2025 10:34 9s
Soe time ago, we fixed the config validator to accept revServer lines… Check for merge conflicts #3369: Commit cb43c6e pushed by DL6ER
February 21, 2025 10:26 11s fix/revServer_wo_domain
fix/revServer_wo_domain
February 21, 2025 10:26 11s
Make additional_headers propery of the embedded webserver CivetWeb ed… Check for merge conflicts #3368: Commit d9fd060 pushed by DL6ER
February 21, 2025 10:14 14s new/webserver_headers
new/webserver_headers
February 21, 2025 10:14 14s
Fix CLI command for non-local API configuration Check for merge conflicts #3367: Pull request #2233 synchronize by DL6ER
February 21, 2025 09:22 11s
February 21, 2025 09:22 11s
In the corner-case of a user explicitly having configured Pi-hole to … Check for merge conflicts #3366: Commit 47688b9 pushed by DL6ER
February 21, 2025 09:22 11s fix/local_api_no_lo
fix/local_api_no_lo
February 21, 2025 09:22 11s