Skip to content

Actions: pi-hole/PADD

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
118 workflow run results
118 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

PADD v4.0.0 Check for merge conflicts #434: Pull request #373 synchronize by yubiuser
October 26, 2024 12:14 12s
October 26, 2024 12:14 12s
Bump actions/checkout from 4.2.1 to 4.2.2 (#407) Check for merge conflicts #433: Commit 020c13f pushed by yubiuser
October 26, 2024 12:14 2m 10s development
development
October 26, 2024 12:14 2m 10s
Bump actions/checkout from 4.2.1 to 4.2.2 Check for merge conflicts #432: Commit 8bcf9f4 pushed by dependabot bot
October 26, 2024 10:38 15s dependabot/github_actions/development/actions/checkout-4.2.2
dependabot/github_actions/development/actions/checkout-4.2.2
October 26, 2024 10:38 15s
PADD v4.0.0 Check for merge conflicts #431: Pull request #373 synchronize by yubiuser
October 12, 2024 14:16 2m 11s
October 12, 2024 14:16 2m 11s
Bump actions/checkout from 4.2.0 to 4.2.1 (#406) Check for merge conflicts #430: Commit 1e28893 pushed by yubiuser
October 12, 2024 14:16 2m 14s development
development
October 12, 2024 14:16 2m 14s
Bump actions/checkout from 4.2.0 to 4.2.1 Check for merge conflicts #429: Commit 384af25 pushed by dependabot bot
October 12, 2024 10:52 10s dependabot/github_actions/development/actions/checkout-4.2.1
dependabot/github_actions/development/actions/checkout-4.2.1
October 12, 2024 10:52 10s
PADD v4.0.0 Check for merge conflicts #428: Pull request #373 synchronize by yubiuser
September 28, 2024 11:13 15s
September 28, 2024 11:13 15s
Bump actions/checkout from 4.1.7 to 4.2.0 (#405) Check for merge conflicts #427: Commit 85f9b90 pushed by yubiuser
September 28, 2024 11:13 2m 14s development
development
September 28, 2024 11:13 2m 14s
Bump actions/checkout from 4.1.7 to 4.2.0 Check for merge conflicts #426: Commit f7c88ee pushed by dependabot bot
September 28, 2024 10:37 13s dependabot/github_actions/development/actions/checkout-4.2.0
dependabot/github_actions/development/actions/checkout-4.2.0
September 28, 2024 10:37 13s
PADD v4.0.0 Check for merge conflicts #425: Pull request #373 synchronize by yubiuser
September 27, 2024 09:00 2m 13s
September 27, 2024 09:00 2m 13s
Fix CPU load (#404) Check for merge conflicts #424: Commit 2066fc4 pushed by yubiuser
September 27, 2024 09:00 2m 15s development
development
September 27, 2024 09:00 2m 15s
Fix CPU load Check for merge conflicts #423: Commit 9bfb338 pushed by yubiuser
September 26, 2024 20:43 13s fix/cpu
fix/cpu
September 26, 2024 20:43 13s
Make PADD compatible with FTLv6 (#247) Check for merge conflicts #421: Commit 4a34c23 pushed by yubiuser
September 2, 2024 21:00 15s development
development
September 2, 2024 21:00 15s
PADD v4.0.0 Check for merge conflicts #422: Pull request #373 synchronize by yubiuser
September 2, 2024 21:00 13s
September 2, 2024 21:00 13s
Make PADD compatible with FTLv6 Check for merge conflicts #420: Pull request #247 synchronize by PromoFaux
September 2, 2024 20:48 13s
September 2, 2024 20:48 13s
Merge branch 'development' into PADD_FTLv6 Check for merge conflicts #419: Commit e7f4989 pushed by PromoFaux
September 2, 2024 20:48 2m 11s PADD_FTLv6
PADD_FTLv6
September 2, 2024 20:48 2m 11s
Merge branch 'development' into resolve_merge Check for merge conflicts #418: Commit f3832d6 pushed by yubiuser
September 2, 2024 20:46 11s resolve_merge
resolve_merge
September 2, 2024 20:46 11s
Make PADD compatible with FTLv6 Check for merge conflicts #417: Pull request #247 synchronize by yubiuser
August 12, 2024 20:26 11s
August 12, 2024 20:26 11s
Use FTL's taildored /padd endpoint to reduce the number of API call… Check for merge conflicts #416: Commit 9e7d6c8 pushed by yubiuser
August 12, 2024 20:26 10s PADD_FTLv6
PADD_FTLv6
August 12, 2024 20:26 10s
Use FTL's taildored /padd endpoint to reduce the number of API calls Check for merge conflicts #415: Pull request #399 synchronize by yubiuser
August 9, 2024 21:20 11s
August 9, 2024 21:20 11s
Require all API data after connection is re-established Check for merge conflicts #414: Commit 0440ade pushed by yubiuser
August 9, 2024 21:20 11s new/api_padd
new/api_padd
August 9, 2024 21:20 11s
Use FTL's taildored /padd endpoint to reduce the number of API calls Check for merge conflicts #413: Pull request #399 synchronize by yubiuser
August 9, 2024 20:54 16s
August 9, 2024 20:54 16s
Set --connect-timeout for curl connections Check for merge conflicts #412: Commit 09e3396 pushed by yubiuser
August 9, 2024 20:54 13s new/api_padd
new/api_padd
August 9, 2024 20:54 13s
Use FTL's taildored /padd endpoint to reduce the number of API calls Check for merge conflicts #411: Pull request #399 synchronize by yubiuser
August 9, 2024 19:06 11s
August 9, 2024 19:06 11s
Fix --version command Check for merge conflicts #410: Commit 97006b0 pushed by yubiuser
August 9, 2024 19:06 10s new/api_padd
new/api_padd
August 9, 2024 19:06 10s