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,762 workflow runs
1,762 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #1835 from pi-hole/fix/one_of_string_array Check for merge conflicts #1760: Commit e48ee5f pushed by DL6ER
January 7, 2024 06:48 2m 12s development-v6
development-v6
January 7, 2024 06:48 2m 12s
Add Location header for newly created groups/clients/domains/lists Check for merge conflicts #1759: Commit 8806f64 pushed by DL6ER
January 6, 2024 17:16 10s new/location
new/location
January 6, 2024 17:16 10s
Add additional config validation Check for merge conflicts #1758: Pull request #1773 synchronize by DL6ER
January 6, 2024 17:09 13s
January 6, 2024 17:09 13s
Merge branch 'development-v6' into new/validator Check for merge conflicts #1757: Commit 33df6d4 pushed by DL6ER
January 6, 2024 17:09 12s new/validator
new/validator
January 6, 2024 17:09 12s
Merge pull request #1849 from pi-hole/master Check for merge conflicts #1756: Commit 9865925 pushed by PromoFaux
January 6, 2024 16:50 2m 10s development
development
January 6, 2024 16:50 2m 10s
Bump the github_action-dependencies group with 3 updates Check for merge conflicts #1755: Commit b072931 pushed by dependabot bot
January 6, 2024 16:48 8s dependabot-github_actions-development-github_action-dependencies-9391b4915f
dependabot-github_actions-development-github_action-dependencies-9391b4915f
January 6, 2024 16:48 8s
Merge pull request #1822 from pi-hole/development Check for merge conflicts #1754: Commit 0122731 pushed by PromoFaux
January 6, 2024 16:48 9s v5.24
v5.24
January 6, 2024 16:48 9s
Merge pull request #1822 from pi-hole/development Check for merge conflicts #1753: Commit 0122731 pushed by PromoFaux
January 6, 2024 16:47 11s master
master
January 6, 2024 16:47 11s
Add Location header for newly created groups/clients/domains/lists Check for merge conflicts #1752: Commit e3b967e pushed by DL6ER
January 6, 2024 15:57 13s new/location
new/location
January 6, 2024 15:57 13s
Merge pull request #1766 from pi-hole/new/teleporter_v5 Check for merge conflicts #1751: Commit 977acf4 pushed by DL6ER
January 6, 2024 15:42 2m 12s development-v6
development-v6
January 6, 2024 15:42 2m 12s
Pi-hole FTL v5.24 Check for merge conflicts #1750: Pull request #1822 synchronize by PromoFaux
January 6, 2024 15:37 10s
January 6, 2024 15:37 10s
Merge pull request #1576 from pi-hole/group_dependabot Check for merge conflicts #1749: Commit 42be80e pushed by PromoFaux
January 6, 2024 15:37 13s development
development
January 6, 2024 15:37 13s
Merge pull request #1806 from pi-hole/tweak/even_better_database Check for merge conflicts #1748: Commit c2af66d pushed by DL6ER
January 6, 2024 12:43 2m 14s development-v6
development-v6
January 6, 2024 12:43 2m 14s
Use WAL, remove (and strip) SQLite3 shared-cache support and improve attached database handling Check for merge conflicts #1747: Pull request #1806 synchronize by DL6ER
January 6, 2024 08:13 12s
January 6, 2024 08:13 12s
Ensure database analysis / MAC vendor update is running also when FTL… Check for merge conflicts #1746: Commit d77547d pushed by DL6ER
January 6, 2024 08:13 11s tweak/even_better_database
tweak/even_better_database
January 6, 2024 08:13 11s
Use WAL, remove (and strip) SQLite3 shared-cache support and improve attached database handling Check for merge conflicts #1745: Pull request #1806 synchronize by DL6ER
January 5, 2024 16:02 10s
January 5, 2024 16:02 10s
Merge branch 'development-v6' into tweak/even_better_database Check for merge conflicts #1744: Commit 710e0bb pushed by DL6ER
January 5, 2024 16:02 10s tweak/even_better_database
tweak/even_better_database
January 5, 2024 16:02 10s
Use WAL, remove (and strip) SQLite3 shared-cache support and improve attached database handling Check for merge conflicts #1743: Pull request #1806 synchronize by DL6ER
January 5, 2024 15:46 9s
January 5, 2024 15:46 9s
Run ANALYZE instead of PRAMGA optimize after some discussion with the… Check for merge conflicts #1742: Commit da7c3a7 pushed by DL6ER
January 5, 2024 15:46 12s tweak/even_better_database
tweak/even_better_database
January 5, 2024 15:46 12s
Merge pull request #1846 from akordowski/fix/dns-blocking-docs Check for merge conflicts #1741: Commit 2fef4e2 pushed by DL6ER
January 5, 2024 15:34 2m 12s development-v6
development-v6
January 5, 2024 15:34 2m 12s
Fix POST \dns\blocking request documentation Check for merge conflicts #1740: Pull request #1846 synchronize by akordowski
January 5, 2024 14:45 19s
January 5, 2024 14:45 19s
Merge pull request #1840 from pi-hole/fix/cache_recycling Check for merge conflicts #1739: Commit c24c1e1 pushed by DL6ER
January 4, 2024 22:25 2m 12s development-v6
development-v6
January 4, 2024 22:25 2m 12s
Merge pull request #1848 from pi-hole/simplify/download Check for merge conflicts #1738: Commit e1cdad4 pushed by yubiuser
January 4, 2024 17:26 2m 14s development-v6
development-v6
January 4, 2024 17:26 2m 14s
Account for api-docs Check for merge conflicts #1737: Commit 5404166 pushed by yubiuser
January 3, 2024 21:33 19s simplify/download
simplify/download
January 3, 2024 21:33 19s
Simplify artifacts download Check for merge conflicts #1736: Commit 136982c pushed by yubiuser
January 3, 2024 21:28 12s simplify/download
simplify/download
January 3, 2024 21:28 12s
ProTip! You can narrow down the results and go further in time using created:<2024-01-03 or the other filters available.