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,239 workflow runs
2,239 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Explicitly enable HTTP2 in CivetWeb Check for merge conflicts #3009: Commit 5f2e524 pushed by DL6ER
November 9, 2024 22:57 11s http2
http2
November 9, 2024 22:57 11s
Temporarily install openssl-libs-static to build FTL until we have a … Check for merge conflicts #3008: Commit 0cf9ddb pushed by DL6ER
November 9, 2024 22:40 14s http2
http2
November 9, 2024 22:40 14s
Temporarily install openssl-libs-static to build FTL until we have a … Check for merge conflicts #3007: Commit 3bfde27 pushed by DL6ER
November 9, 2024 22:39 20s http2
http2
November 9, 2024 22:39 20s
Temporarily install openssl-libs-static to build FTL until we have a … Check for merge conflicts #3006: Commit f970f94 pushed by DL6ER
November 9, 2024 22:37 21s http2
http2
November 9, 2024 22:37 21s
No HAVE_MBEDTLS Check for merge conflicts #3005: Commit d9d9f68 pushed by yubiuser
November 9, 2024 20:48 10s http2
http2
November 9, 2024 20:48 10s
Use OpenSSL Check for merge conflicts #3004: Commit 6439312 pushed by yubiuser
November 9, 2024 20:09 15s http2
http2
November 9, 2024 20:09 15s
Always init_alpn Check for merge conflicts #3003: Commit ee924ed pushed by yubiuser
November 9, 2024 12:24 11s http2
http2
November 9, 2024 12:24 11s
Add ALPN support Check for merge conflicts #3002: Commit 4bda4d9 pushed by yubiuser
November 9, 2024 10:39 10s http2
http2
November 9, 2024 10:39 10s
Enable HTTP/2 support Check for merge conflicts #3001: Commit bda1d0d pushed by yubiuser
November 9, 2024 09:07 14s http2
http2
November 9, 2024 09:07 14s
Merge pull request #2113 from pi-hole/fix/dns_domains_validation Check for merge conflicts #3000: Commit 848367f pushed by DL6ER
November 8, 2024 18:13 2m 12s development
development
November 8, 2024 18:13 2m 12s
Fix dns.domain check to accept empty string Check for merge conflicts #2999: Commit 5a5caa7 pushed by rdwebdesign
November 8, 2024 17:37 14s fix/dns_domains_validation
fix/dns_domains_validation
November 8, 2024 17:37 14s
Merge pull request #2110 from pi-hole/tweak/resolve_errors Check for merge conflicts #2998: Commit 54b4ad9 pushed by DL6ER
November 7, 2024 19:27 2m 15s development
development
November 7, 2024 19:27 2m 15s
Log what we tried to resolve (and where and how) when it failed for s… Check for merge conflicts #2997: Commit 1f5e98e pushed by DL6ER
November 7, 2024 18:36 12s tweak/resolve_errors
tweak/resolve_errors
November 7, 2024 18:36 12s
Log what we tried to resolve (and where and how) when it failed for s… Check for merge conflicts #2996: Commit 87714ff pushed by DL6ER
November 7, 2024 18:32 16s tweak/resolve_errors
tweak/resolve_errors
November 7, 2024 18:32 16s
Merge pull request #2108 from pi-hole/fix/netlink_msg_size Check for merge conflicts #2995: Commit 5587399 pushed by DL6ER
November 7, 2024 06:06 2m 12s development
development
November 7, 2024 06:06 2m 12s
Merge pull request #2109 from pi-hole/fix/upstream_lookups Check for merge conflicts #2994: Commit bdfca59 pushed by DL6ER
November 6, 2024 15:14 2m 12s development
development
November 6, 2024 15:14 2m 12s
Upstream lookups should always check for the magic byte while searching Check for merge conflicts #2993: Commit d8a521e pushed by DL6ER
November 6, 2024 09:49 10s fix/upstream_lookups
fix/upstream_lookups
November 6, 2024 09:49 10s
Increase buffer size of netlink messages to 32 KB and fix incorrect n… Check for merge conflicts #2992: Commit 4e1a67f pushed by DL6ER
November 6, 2024 09:37 12s fix/netlink_msg_size
fix/netlink_msg_size
November 6, 2024 09:37 12s
Increase buffer size of netlink messages to 32 KB and fix incorrect n… Check for merge conflicts #2991: Commit bb34fd0 pushed by DL6ER
November 6, 2024 09:30 11s fix/netlink_msg_size
fix/netlink_msg_size
November 6, 2024 09:30 11s
Merge pull request #2104 from pi-hole/tweak/build_script Check for merge conflicts #2990: Commit a5641e3 pushed by DL6ER
November 5, 2024 10:08 2m 15s development
development
November 5, 2024 10:08 2m 15s
Merge pull request #2105 from pi-hole/tweak/binsearch Check for merge conflicts #2989: Commit 510cb1b pushed by DL6ER
November 4, 2024 18:53 2m 13s development
development
November 4, 2024 18:53 2m 13s
Improve build.sh script Check for merge conflicts #2988: Pull request #2104 synchronize by DL6ER
November 4, 2024 18:22 10s
November 4, 2024 18:22 10s
Enhance build.sh to support passing CMake arguments Check for merge conflicts #2987: Commit 7d357d7 pushed by DL6ER
November 4, 2024 18:22 14s tweak/build_script
tweak/build_script
November 4, 2024 18:22 14s
Improve build.sh script Check for merge conflicts #2986: Pull request #2104 synchronize by DL6ER
November 4, 2024 13:55 21s
November 4, 2024 13:55 21s
shellcheck adjustments Check for merge conflicts #2985: Commit 558703e pushed by DL6ER
November 4, 2024 13:55 14s tweak/build_script
tweak/build_script
November 4, 2024 13:55 14s