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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Tidy up Check for merge conflicts #830: Commit b5a20e4 pushed by yubiuser
August 1, 2023 20:23 18s remove/manpages
remove/manpages
August 1, 2023 20:23 18s
Remove the test case. We cannot unwind on ARM (not supported by the p… Check for merge conflicts #829: Commit fbaefcf pushed by DL6ER
August 1, 2023 19:59 10s new/unwinding
new/unwinding
August 1, 2023 19:59 10s
Ensure disk database is detached on SQL issues Check for merge conflicts #828: Commit e427795 pushed by DL6ER
August 1, 2023 19:57 13s fix/diskdb
fix/diskdb
August 1, 2023 19:57 13s
Remove the test case. We cannot unwind on ARM (not supported by the p… Check for merge conflicts #827: Commit e5b5de8 pushed by DL6ER
August 1, 2023 19:42 11s new/unwinding
new/unwinding
August 1, 2023 19:42 11s
Merge pull request #1609 from pi-hole/tweak/webserver_port Check for merge conflicts #826: Commit 1c50611 pushed by DL6ER
August 1, 2023 19:35 2m 14s development-v6
development-v6
August 1, 2023 19:35 2m 14s
Dynamically depend on availability of libunwind Check for merge conflicts #825: Commit 945df7f pushed by DL6ER
August 1, 2023 19:08 11s new/unwinding
new/unwinding
August 1, 2023 19:08 11s
Dynamically depend on availability of libunwind Check for merge conflicts #824: Commit 2757cd5 pushed by DL6ER
August 1, 2023 18:34 12s new/unwinding
new/unwinding
August 1, 2023 18:34 12s
Add regex filtering support for domains on the Query Log (new config … Check for merge conflicts #823: Commit d3a6a9d pushed by DL6ER
August 1, 2023 14:54 12s new/queryLogRegex
new/queryLogRegex
August 1, 2023 14:54 12s
Add regex filtering support for domains on the Query Log (new config … Check for merge conflicts #822: Commit 8686c4c pushed by DL6ER
August 1, 2023 14:34 19s new/queryLogRegex
new/queryLogRegex
August 1, 2023 14:34 19s
Tweaks for the webserver port Check for merge conflicts #821: Pull request #1609 synchronize by DL6ER
August 1, 2023 13:54 11s
August 1, 2023 13:54 11s
Change default webport to 80 Check for merge conflicts #820: Commit da544dc pushed by DL6ER
August 1, 2023 13:54 10s tweak/webserver_port
tweak/webserver_port
August 1, 2023 13:54 10s
Copy missing information from man pihole-FTL to pihole-FTL -h Check for merge conflicts #819: Pull request #1570 synchronize by yubiuser
July 31, 2023 21:12 15s
July 31, 2023 21:12 15s
Copy missing information from man pihole-FTL to pihole-FTL -h Check for merge conflicts #818: Commit 75b27f2 pushed by yubiuser
July 31, 2023 21:12 15s remove/manpages
remove/manpages
July 31, 2023 21:12 15s
Add articifial crash test Check for merge conflicts #817: Commit f002e65 pushed by DL6ER
July 30, 2023 21:52 9s new/unwinding
new/unwinding
July 30, 2023 21:52 9s
Add antigravity (subscribed allowlists with wildcard support) Check for merge conflicts #816: Pull request #1579 synchronize by DL6ER
July 30, 2023 21:38 14s
July 30, 2023 21:38 14s
Further simplify antigravity over gravity priority code Check for merge conflicts #815: Commit 8db2156 pushed by DL6ER
July 30, 2023 21:38 10s new/antigravity
new/antigravity
July 30, 2023 21:38 10s
Add guaranteed-to-fail test Check for merge conflicts #814: Commit 75a3a60 pushed by DL6ER
July 30, 2023 21:38 12s new/unwinding
new/unwinding
July 30, 2023 21:38 12s
Add antigravity (subscribed allowlists with wildcard support) Check for merge conflicts #813: Pull request #1579 synchronize by DL6ER
July 30, 2023 21:35 11s
July 30, 2023 21:35 11s
Add guaranteed-to-fail test Check for merge conflicts #812: Commit ba0824c pushed by DL6ER
July 30, 2023 21:35 11s new/antigravity
new/antigravity
July 30, 2023 21:35 11s
Add antigravity (subscribed allowlists with wildcard support) Check for merge conflicts #811: Pull request #1579 synchronize by DL6ER
July 30, 2023 19:50 3m 2s
July 30, 2023 19:50 3m 2s
Further simplify antigravity over gravity priority code Check for merge conflicts #810: Commit 8db2156 pushed by DL6ER
July 30, 2023 19:50 2m 46s new/antigravity
new/antigravity
July 30, 2023 19:50 2m 46s
Provide regex ID for API Check for merge conflicts #809: Pull request #1607 synchronize by DL6ER
July 30, 2023 19:49 2m 49s
July 30, 2023 19:49 2m 49s
Provide regex ID for API Check for merge conflicts #808: Commit a9d4771 pushed by DL6ER
July 30, 2023 19:49 2m 30s tweak/query_details
tweak/query_details
July 30, 2023 19:49 2m 30s
Tweaks for the webserver port Check for merge conflicts #807: Pull request #1609 synchronize by DL6ER
July 30, 2023 19:48 12s
July 30, 2023 19:48 12s
Initialized webserver ports dynamically depending on whether ports 80… Check for merge conflicts #806: Commit 70bb611 pushed by DL6ER
July 30, 2023 19:48 12s tweak/webserver_port
tweak/webserver_port
July 30, 2023 19:48 12s
ProTip! You can narrow down the results and go further in time using created:<2023-07-30 or the other filters available.