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

Make adlist ID available, rename queries.regex_id -> queries.list_id Check for merge conflicts #1735: Pull request #1841 synchronize by DL6ER
January 1, 2024 20:03 11s
January 1, 2024 20:03 11s
Merge branch 'development-v6' into tweak/list_id Check for merge conflicts #1734: Commit 83dfd62 pushed by DL6ER
January 1, 2024 20:03 11s tweak/list_id
tweak/list_id
January 1, 2024 20:03 11s
Make adlist ID available, rename queries.regex_id -> queries.list_id Check for merge conflicts #1733: Pull request #1841 synchronize by DL6ER
January 1, 2024 07:59 15s
January 1, 2024 07:59 15s
Use IN where = was used but a multi-value result may occur Check for merge conflicts #1732: Commit 3d41513 pushed by DL6ER
January 1, 2024 07:59 9s tweak/list_id
tweak/list_id
January 1, 2024 07:59 9s
Use WAL, remove (and strip) SQLite3 shared-cache support and improve attached database handling Check for merge conflicts #1731: Pull request #1806 synchronize by DL6ER
January 1, 2024 07:41 11s
January 1, 2024 07:41 11s
Optimize database on close (gravity) or frequently (queries) Check for merge conflicts #1730: Commit 975c468 pushed by DL6ER
January 1, 2024 07:41 10s tweak/even_better_database
tweak/even_better_database
January 1, 2024 07:41 10s
Make adlist ID available, rename queries.regex_id -> queries.list_id Check for merge conflicts #1729: Pull request #1841 synchronize by DL6ER
December 28, 2023 10:12 12s
December 28, 2023 10:12 12s
Port gravity.db update to version 19 into FTL's testing harness Check for merge conflicts #1728: Commit 72aea36 pushed by DL6ER
December 28, 2023 10:12 12s tweak/list_id
tweak/list_id
December 28, 2023 10:12 12s
Make adlist ID available, rename queries.regex_id -> queries.list_id Check for merge conflicts #1727: Pull request #1841 synchronize by DL6ER
December 27, 2023 18:08 14s
December 27, 2023 18:08 14s
Recheck statements in forks to avoid edge-case collisions possibly le… Check for merge conflicts #1726: Commit e022600 pushed by DL6ER
December 27, 2023 18:08 11s tweak/list_id
tweak/list_id
December 27, 2023 18:08 11s
Fix POST \dns\blocking request documentation Check for merge conflicts #1725: Pull request #1846 synchronize by akordowski
December 27, 2023 15:10 13s
December 27, 2023 15:10 13s
Fix POST \dns\blocking request documentation Check for merge conflicts #1724: Pull request #1846 synchronize by akordowski
December 27, 2023 14:56 9s
December 27, 2023 14:56 9s
Merge pull request #1842 from pi-hole/tweak/rollback_error Check for merge conflicts #1723: Commit a8d2991 pushed by DL6ER
December 26, 2023 21:59 2m 15s development-v6
development-v6
December 26, 2023 21:59 2m 15s
ProTip! You can narrow down the results and go further in time using created:<2023-12-26 or the other filters available.