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 #2275 from pi-hole/fix/maxHistory Check for merge conflicts #3465: Commit acec7a8 pushed by DL6ER
February 24, 2025 22:36 2m 11s development
development
February 24, 2025 22:36 2m 11s
Merge pull request #2273 from pi-hole/new/print_invalid_env Check for merge conflicts #3464: Commit 0c91c17 pushed by DL6ER
February 24, 2025 21:05 2m 13s development
development
February 24, 2025 21:05 2m 13s
Print values of env vars if they are invalid Check for merge conflicts #3463: Pull request #2273 synchronize by DL6ER
February 24, 2025 20:54 10s
February 24, 2025 20:54 10s
Avoid (null) as explanation Check for merge conflicts #3462: Commit ab80387 pushed by DL6ER
February 24, 2025 20:54 10s new/print_invalid_env
new/print_invalid_env
February 24, 2025 20:54 10s
Print values of env vars if they are invalid Check for merge conflicts #3461: Pull request #2273 synchronize by DL6ER
February 24, 2025 20:34 13s
February 24, 2025 20:34 13s
Ensure warnings/errors about invalid env vars are only printed once Check for merge conflicts #3460: Commit 9857a18 pushed by DL6ER
February 24, 2025 20:34 10s new/print_invalid_env
new/print_invalid_env
February 24, 2025 20:34 10s
Fix webserver.api.maxHistory usage in API Check for merge conflicts #3459: Pull request #2275 synchronize by DL6ER
February 24, 2025 20:25 35s
February 24, 2025 20:25 35s
Clarify signedness of the overtime constants (unsigned = always posit… Check for merge conflicts #3458: Commit 4e5ed22 pushed by DL6ER
February 24, 2025 20:25 35s fix/maxHistory
fix/maxHistory
February 24, 2025 20:25 35s
Add specific validator for webserver.paths.webhome ensuring there are… Check for merge conflicts #3457: Commit be6be2b pushed by DL6ER
February 24, 2025 20:19 14s tweak/validate_filepath_two_slash
tweak/validate_filepath_two_slash
February 24, 2025 20:19 14s
Print values of env vars if they are invalid Check for merge conflicts #3456: Pull request #2273 synchronize by DL6ER
February 24, 2025 20:13 14s
February 24, 2025 20:13 14s
Ensure warnings/errors about invalid env vars are only printed once Check for merge conflicts #3455: Commit a5864de pushed by DL6ER
February 24, 2025 20:13 16s new/print_invalid_env
new/print_invalid_env
February 24, 2025 20:13 16s
Fix webserver.api.maxHistory usage in API Check for merge conflicts #3454: Pull request #2275 synchronize by DL6ER
February 24, 2025 20:07 11s
February 24, 2025 20:07 11s
Clarify signedness of the overtime constants (unsigned = always posit… Check for merge conflicts #3453: Commit b18156e pushed by DL6ER
February 24, 2025 20:07 14s fix/maxHistory
fix/maxHistory
February 24, 2025 20:07 14s
Merge pull request #2271 from pi-hole/fix/teleporter_v5_leasetime Check for merge conflicts #3452: Commit ad1041e pushed by DL6ER
February 24, 2025 20:00 2m 12s development
development
February 24, 2025 20:00 2m 12s
Print values of env vars if they are invalid Check for merge conflicts #3451: Pull request #2273 synchronize by DL6ER
February 24, 2025 19:59 11s
February 24, 2025 19:59 11s
Ensure warnings/errors about invalid env vars are only printed once Check for merge conflicts #3450: Commit d821b07 pushed by DL6ER
February 24, 2025 19:59 16s new/print_invalid_env
new/print_invalid_env
February 24, 2025 19:59 16s
Merge pull request #2272 from pi-hole/fix/delete Check for merge conflicts #3449: Commit 1fcb2bb pushed by DL6ER
February 24, 2025 19:44 2m 12s development
development
February 24, 2025 19:44 2m 12s
Data returned by the API for over-time statistics should not return m… Check for merge conflicts #3448: Commit 3fe2333 pushed by DL6ER
February 24, 2025 18:45 13s fix/maxHistory
fix/maxHistory
February 24, 2025 18:45 13s
Explicitly log allowed items Check for merge conflicts #3447: Commit 494d27a pushed by DL6ER
February 24, 2025 18:09 11s new/print_invalid_env
new/print_invalid_env
February 24, 2025 18:09 11s
We should not send any content for HTTP codes 1xx, 204 and 304 Check for merge conflicts #3446: Pull request #2272 synchronize by DL6ER
February 24, 2025 17:50 12s
February 24, 2025 17:50 12s
We should not send any content for HTTP codes 1xx, 204 and 304 Check for merge conflicts #3445: Commit 6ffd43b pushed by DL6ER
February 24, 2025 17:50 12s fix/delete
fix/delete
February 24, 2025 17:50 12s
We should not send any content for HTTP codes 1xx, 204 and 304 Check for merge conflicts #3444: Commit c6e0d94 pushed by DL6ER
February 24, 2025 17:01 11s fix/delete
fix/delete
February 24, 2025 17:01 11s
Assume DHCP_LEASETIME is in hours if imported from setupVars.conf (e.… Check for merge conflicts #3443: Commit edcc941 pushed by DL6ER
February 24, 2025 16:10 12s fix/teleporter_v5_leasetime
fix/teleporter_v5_leasetime
February 24, 2025 16:10 12s
Merge pull request #2256 from iain-henderson/feature/dev-posix-enviro… Check for merge conflicts #3442: Commit 45d0c8a pushed by DL6ER
February 24, 2025 08:00 2m 15s development
development
February 24, 2025 08:00 2m 15s
Update config/env.c to accept conventional environment variables in a… Check for merge conflicts #3441: Pull request #2256 synchronize by iain-henderson
February 23, 2025 22:47 10s
February 23, 2025 22:47 10s