Skip to content

Actions: pi-hole/PADD

Actions

Check for merge conflicts

Actions

Loading...

Show workflow options

Create status badge

merge-conflict.yml
146 workflow runs
146 workflow runs
Event

Filter by event
Status

Filter by status
Branch
Actor

Filter by actor
Do not try to remove stale label on PRs Check for merge conflicts #251: Pull request #357 synchronize by yubiuser
May 31, 2023 20:15 14s
May 31, 2023 20:15 14s
Use env variable Check for merge conflicts #250: Commit 4d17d15 pushed by yubiuser
May 31, 2023 20:15 11s fix/un-stale
fix/un-stale
May 31, 2023 20:15 11s
[WIP] Make PADD compatible with FTLv6 Check for merge conflicts #249: Pull request #247 synchronize by DL6ER
May 30, 2023 20:27 14s
May 30, 2023 20:27 14s
Switch to the proven memory-hard password-hashing alogorithm BALLOON Check for merge conflicts #248: Commit 716897b pushed by DL6ER
May 30, 2023 20:27 12s PADD_FTLv6
PADD_FTLv6
May 30, 2023 20:27 12s
Add note regarding the update status of special Docker tags Check for merge conflicts #247: Pull request #356 synchronize by yubiuser
May 30, 2023 12:02 11s
May 30, 2023 12:02 11s
Add note regarding the update status of special Docker tags Check for merge conflicts #246: Commit 0fcd42f pushed by yubiuser
May 30, 2023 12:02 13s docker_no_update
docker_no_update
May 30, 2023 12:02 13s
Do not try to remove stale label on PRs Check for merge conflicts #245: Commit da8036c pushed by yubiuser
May 29, 2023 20:47 11s fix/un-stale
fix/un-stale
May 29, 2023 20:47 11s
Add note regarding the update status of special Docker tags Check for merge conflicts #244: Pull request #356 synchronize by yubiuser
May 28, 2023 05:56 10s
May 28, 2023 05:56 10s
Add note regarding the update status of special Docker tags Check for merge conflicts #243: Commit 5aaca5f pushed by yubiuser
May 28, 2023 05:56 11s docker_no_update
docker_no_update
May 28, 2023 05:56 11s
Add note regarding the update status of special Docker tags Check for merge conflicts #242: Pull request #356 synchronize by yubiuser
May 27, 2023 22:40 12s
May 27, 2023 22:40 12s
Add note regarding the update status of special Docker tags Check for merge conflicts #241: Commit 94bed74 pushed by yubiuser
May 27, 2023 22:40 10s docker_no_update
docker_no_update
May 27, 2023 22:40 10s
Add note regarding the update status of special Docker tags Check for merge conflicts #240: Commit 07511a9 pushed by yubiuser
May 27, 2023 22:37 11s docker_no_update
docker_no_update
May 27, 2023 22:37 11s
Sync master back into development (#354) Check for merge conflicts #239: Commit cf150ab pushed by yubiuser
May 27, 2023 22:30 2m 10s development
development
May 27, 2023 22:30 2m 10s
PADD v3.11.0 (#338) Check for merge conflicts #238: Commit bd2bc34 pushed by yubiuser
May 27, 2023 22:30 9s v3.11.0
v3.11.0
May 27, 2023 22:30 9s
PADD v3.11.0 (#338) Check for merge conflicts #237: Commit bd2bc34 pushed by yubiuser
May 27, 2023 22:28 15s master
master
May 27, 2023 22:28 15s
[WIP] Make PADD compatible with FTLv6 Check for merge conflicts #236: Pull request #247 synchronize by yubiuser
May 27, 2023 21:45 15s
May 27, 2023 21:45 15s
Merge branch 'development' into PADD_FTLv6 Check for merge conflicts #235: Commit b28c112 pushed by yubiuser
May 27, 2023 21:45 12s PADD_FTLv6
PADD_FTLv6
May 27, 2023 21:45 12s
PADD v3.11.0 Check for merge conflicts #234: Pull request #338 synchronize by yubiuser
May 27, 2023 21:28 10s
May 27, 2023 21:28 10s
Bump version to v3.11.0 (#353) Check for merge conflicts #233: Commit 09a28ab pushed by yubiuser
May 27, 2023 21:28 2m 11s development
development
May 27, 2023 21:28 2m 11s
PADD v3.11.0 Check for merge conflicts #232: Pull request #338 synchronize by yubiuser
May 27, 2023 19:16 12s
May 27, 2023 19:16 12s
Add update option (#352) Check for merge conflicts #231: Commit 4c14bfc pushed by yubiuser
May 27, 2023 19:16 2m 13s development
development
May 27, 2023 19:16 2m 13s
PADD v3.11.0 Check for merge conflicts #230: Pull request #338 synchronize by PromoFaux
May 27, 2023 10:33 11s
May 27, 2023 10:33 11s
Trigger stale workflow on issue comments to remove stale label immedi… Check for merge conflicts #229: Commit e7ac674 pushed by PromoFaux
May 27, 2023 10:33 2m 11s development
development
May 27, 2023 10:33 2m 11s
[WIP] Make PADD compatible with FTLv6 Check for merge conflicts #228: Pull request #247 synchronize by DL6ER
May 25, 2023 18:36 12s
May 25, 2023 18:36 12s
Show a running PADD as "PADD v4.0.0" instead of "curl/7.81.0" on the … Check for merge conflicts #227: Commit b178446 pushed by DL6ER
May 25, 2023 18:36 13s PADD_FTLv6
PADD_FTLv6
May 25, 2023 18:36 13s