Skip to content

Actions: pi-hole/PADD

Actions

Check for merge conflicts

Actions

Loading...

Show workflow options

Create status badge

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

Filter by event
Status

Filter by status
Branch
Actor

Filter by actor
vNext Check for merge conflicts #348: Pull request #373 synchronize by yubiuser
May 11, 2024 12:25 2m 13s
May 11, 2024 12:25 2m 13s
Bump actions/checkout from 4.1.4 to 4.1.5 (#387) Check for merge conflicts #347: Commit eb6ead5 pushed by yubiuser
May 11, 2024 12:25 2m 12s development
development
May 11, 2024 12:25 2m 12s
Bump actions/checkout from 4.1.4 to 4.1.5 Check for merge conflicts #346: Pull request #387 synchronize by dependabot bot
May 11, 2024 12:24 11s
May 11, 2024 12:24 11s
Bump actions/checkout from 4.1.4 to 4.1.5 Check for merge conflicts #345: Commit 29ce039 pushed by dependabot bot
May 11, 2024 12:24 11s dependabot/github_actions/development/actions/checkout-4.1.5
dependabot/github_actions/development/actions/checkout-4.1.5
May 11, 2024 12:24 11s
vNext Check for merge conflicts #344: Pull request #373 synchronize by yubiuser
May 11, 2024 12:23 2m 9s
May 11, 2024 12:23 2m 9s
Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1 (#388) Check for merge conflicts #343: Commit a87bc05 pushed by yubiuser
May 11, 2024 12:23 2m 11s development
development
May 11, 2024 12:23 2m 11s
Bump eps1lon/actions-label-merge-conflict from 3.0.0 to 3.0.1 Check for merge conflicts #342: Commit b950a99 pushed by dependabot bot
May 11, 2024 10:38 12s dependabot/github_actions/development/eps1lon/actions-label-merge-conflict-3.0.1
dependabot/github_actions/development/eps1lon/actions-label-merge-conflict-3.0.1
May 11, 2024 10:38 12s
Bump actions/checkout from 4.1.4 to 4.1.5 Check for merge conflicts #341: Commit c2c512c pushed by dependabot bot
May 11, 2024 10:38 12s dependabot/github_actions/development/actions/checkout-4.1.5
dependabot/github_actions/development/actions/checkout-4.1.5
May 11, 2024 10:38 12s
vNext Check for merge conflicts #340: Pull request #373 synchronize by yubiuser
April 27, 2024 11:14 14s
April 27, 2024 11:14 14s
Bump actions/checkout from 4.1.3 to 4.1.4 (#386) Check for merge conflicts #339: Commit e9cc3a5 pushed by yubiuser
April 27, 2024 11:14 2m 13s development
development
April 27, 2024 11:14 2m 13s
Bump actions/checkout from 4.1.3 to 4.1.4 Check for merge conflicts #338: Commit ae766fb pushed by dependabot bot
April 27, 2024 10:37 12s dependabot/github_actions/development/actions/checkout-4.1.4
dependabot/github_actions/development/actions/checkout-4.1.4
April 27, 2024 10:37 12s
vNext Check for merge conflicts #337: Pull request #373 synchronize by PromoFaux
April 21, 2024 16:23 2m 11s
April 21, 2024 16:23 2m 11s
Bump actions/checkout from 4.1.1 to 4.1.3 Check for merge conflicts #336: Commit 06c76ff pushed by PromoFaux
April 21, 2024 16:23 2m 13s development
development
April 21, 2024 16:23 2m 13s
Bump actions/checkout from 4.1.1 to 4.1.3 Check for merge conflicts #335: Commit c51d817 pushed by dependabot bot
April 20, 2024 10:31 15s dependabot/github_actions/development/actions/checkout-4.1.3
dependabot/github_actions/development/actions/checkout-4.1.3
April 20, 2024 10:31 15s
vNext Check for merge conflicts #334: Pull request #373 synchronize by PromoFaux
April 18, 2024 17:04 12s
April 18, 2024 17:04 12s
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0 (#383) Check for merge conflicts #333: Commit fd07d36 pushed by PromoFaux
April 18, 2024 17:04 2m 11s development
development
April 18, 2024 17:04 2m 11s
Bump eps1lon/actions-label-merge-conflict from 2.1.0 to 3.0.0 Check for merge conflicts #332: Commit 5f8d24f pushed by dependabot bot
March 30, 2024 10:10 10s dependabot/github_actions/development/eps1lon/actions-label-merge-conflict-3.0.0
dependabot/github_actions/development/eps1lon/actions-label-merge-conflict-3.0.0
March 30, 2024 10:10 10s
Bump actions/checkout from 4.1.1 to 4.1.2 Check for merge conflicts #331: Commit adaf141 pushed by dependabot bot
March 16, 2024 10:23 12s dependabot/github_actions/development/actions/checkout-4.1.2
dependabot/github_actions/development/actions/checkout-4.1.2
March 16, 2024 10:23 12s
[WIP] Make PADD compatible with FTLv6 Check for merge conflicts #330: Pull request #247 synchronize by yubiuser
January 11, 2024 18:35 25s
January 11, 2024 18:35 25s
Deleting a session successfully returns 204 (#379) Check for merge conflicts #329: Commit 50f359d pushed by yubiuser
January 11, 2024 18:35 13s PADD_FTLv6
PADD_FTLv6
January 11, 2024 18:35 13s
Deleting a session successfully returns 204 Check for merge conflicts #328: Pull request #379 synchronize by yubiuser
January 7, 2024 21:04 15s
January 7, 2024 21:04 15s
Nicer output if no session needed to be deleted Check for merge conflicts #327: Commit d58149d pushed by yubiuser
January 7, 2024 21:04 12s delete_session
delete_session
January 7, 2024 21:04 12s
Deleting a session successfully returns 204 Check for merge conflicts #326: Pull request #379 synchronize by yubiuser
January 7, 2024 20:05 14s
January 7, 2024 20:05 14s
Status 200 is gone Check for merge conflicts #325: Commit 79ca42e pushed by yubiuser
January 7, 2024 20:05 9s delete_session
delete_session
January 7, 2024 20:05 9s
[WIP] Make PADD compatible with FTLv6 Check for merge conflicts #324: Pull request #247 synchronize by yubiuser
January 7, 2024 14:45 12s
January 7, 2024 14:45 12s