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 #2204 from pi-hole/fix/envvars_splitting Check for merge conflicts #3340: Commit f68a6bb pushed by DL6ER
February 19, 2025 16:52 2m 12s development
development
February 19, 2025 16:52 2m 12s
Merge pull request #2200 from pi-hole/gh/permissions Check for merge conflicts #3339: Commit 093c921 pushed by DL6ER
February 19, 2025 16:21 2m 10s development
development
February 19, 2025 16:21 2m 10s
Ensure we do not split too often at '=' while processing environment … Check for merge conflicts #3338: Commit 099eb1c pushed by DL6ER
February 19, 2025 16:19 11s fix/envvars_splitting
fix/envvars_splitting
February 19, 2025 16:19 11s
Allow default GH token to write content in the build script Check for merge conflicts #3337: Commit 37579a0 pushed by yubiuser
February 19, 2025 09:37 13s gh/permissions
gh/permissions
February 19, 2025 09:37 13s
Do not fail hard on inability to validate ZIP file, just log a warning Check for merge conflicts #3336: Commit 926c2a4 pushed by DL6ER
February 19, 2025 07:49 12s fix/teleporter_zip_verify
fix/teleporter_zip_verify
February 19, 2025 07:49 12s
Add dependabot for npm Check for merge conflicts #3335: Commit a541d20 pushed by yubiuser
February 18, 2025 22:12 14s dependabot/npm
dependabot/npm
February 18, 2025 22:12 14s
Merge pull request #2189 from pi-hole/master Check for merge conflicts #3334: Commit 3b78e07 pushed by DL6ER
February 18, 2025 18:23 2m 12s development
development
February 18, 2025 18:23 2m 12s
Bump follow-redirects from 1.15.2 to 1.15.9 Check for merge conflicts #3333: Commit 3d2800f pushed by dependabot bot
February 18, 2025 17:20 15s dependabot/npm_and_yarn/follow-redirects-1.15.9
dependabot/npm_and_yarn/follow-redirects-1.15.9
February 18, 2025 17:20 15s
Bump the npm_and_yarn group across 1 directory with 4 updates Check for merge conflicts #3332: Commit e62006e pushed by dependabot bot
February 18, 2025 17:20 10s dependabot/npm_and_yarn/npm_and_yarn-92b7dc7bb0
dependabot/npm_and_yarn/npm_and_yarn-92b7dc7bb0
February 18, 2025 17:20 10s
Merge pull request #2153 from pi-hole/development Check for merge conflicts #3331: Commit eaa7dbb pushed by PromoFaux
February 18, 2025 17:20 10s v6.0
v6.0
February 18, 2025 17:20 10s
Merge pull request #2153 from pi-hole/development Check for merge conflicts #3330: Commit eaa7dbb pushed by PromoFaux
February 18, 2025 17:19 11s master
master
February 18, 2025 17:19 11s
Pi-hole FTL v6.0 Check for merge conflicts #3329: Pull request #2153 synchronize by DL6ER
February 18, 2025 16:31 11s
February 18, 2025 16:31 11s
Merge pull request #2188 from pi-hole/update/sqlite_3.49.1 Check for merge conflicts #3328: Commit c51c491 pushed by DL6ER
February 18, 2025 16:31 2m 12s development
development
February 18, 2025 16:31 2m 12s
Pi-hole FTL v6.0 Check for merge conflicts #3327: Pull request #2153 synchronize by DL6ER
February 18, 2025 15:56 14s
February 18, 2025 15:56 14s
Merge pull request #2187 from pi-hole/update/dnsmasq Check for merge conflicts #3326: Commit 9319f37 pushed by DL6ER
February 18, 2025 15:55 2m 10s development
development
February 18, 2025 15:55 2m 10s
Update embedded SQLite3 to 3.49.1 Check for merge conflicts #3325: Commit dbdfe86 pushed by DL6ER
February 18, 2025 15:14 11s update/sqlite_3.49.1
update/sqlite_3.49.1
February 18, 2025 15:14 11s
Pi-hole FTL v6.0 Check for merge conflicts #3324: Pull request #2153 synchronize by DL6ER
February 12, 2025 19:48 2m 9s
February 12, 2025 19:48 2m 9s
Merge pull request #2186 from pi-hole/tweak/dhcp-dicsover_timeout Check for merge conflicts #3323: Commit 32d2345 pushed by DL6ER
February 12, 2025 19:48 2m 11s development
development
February 12, 2025 19:48 2m 11s
Fix dhcp-discover locking Check for merge conflicts #3322: Commit 10a486d pushed by DL6ER
February 12, 2025 19:10 11s tweak/dhcp-dicsover_timeout
tweak/dhcp-dicsover_timeout
February 12, 2025 19:10 11s
Add temporary locking messages Check for merge conflicts #3321: Commit 5171c2d pushed by DL6ER
February 11, 2025 20:05 12s tweak/dhcp-dicsover_timeout
tweak/dhcp-dicsover_timeout
February 11, 2025 20:05 12s
Pi-hole FTL v6.0 Check for merge conflicts #3320: Pull request #2153 synchronize by DL6ER
February 11, 2025 20:04 2m 18s
February 11, 2025 20:04 2m 18s
Merge pull request #2184 from pi-hole/fix/duplicate_processes Check for merge conflicts #3319: Commit d70af72 pushed by DL6ER
February 11, 2025 20:04 2m 18s development
development
February 11, 2025 20:04 2m 18s
Use ppoll in recv_adv() to be able to specify an absolute timeout value Check for merge conflicts #3318: Commit d2f6d1a pushed by DL6ER
February 11, 2025 17:03 16s tweak/dhcp-dicsover_timeout
tweak/dhcp-dicsover_timeout
February 11, 2025 17:03 16s
Fix duplicate process detection Check for merge conflicts #3317: Pull request #2184 synchronize by DL6ER
February 10, 2025 17:19 9s
February 10, 2025 17:19 9s
Use /proc/<PID>/status instead of a call to kill(<PID>, 0) to get the… Check for merge conflicts #3316: Commit d019b04 pushed by DL6ER
February 10, 2025 17:18 12s fix/duplicate_processes
fix/duplicate_processes
February 10, 2025 17:18 12s