Skip to content

Actions: pi-hole/PADD

Actions

Check for merge conflicts

Actions

Loading...

Show workflow options

Create status badge

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

Filter by event
Status

Filter by status
Branch
Actor

Filter by actor
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
Trigger stale workflow on issue comments to remove stale label immediately Check for merge conflicts #226: Pull request #350 synchronize by yubiuser
May 4, 2023 10:02 16s
May 4, 2023 10:02 16s
Use env variable Check for merge conflicts #225: Commit 592e7e7 pushed by yubiuser
May 4, 2023 10:02 12s tweak/stale
tweak/stale
May 4, 2023 10:02 12s
Trigger stale workflow on issue comments to remove stale label immediately Check for merge conflicts #224: Pull request #350 synchronize by yubiuser
April 17, 2023 18:57 13s
April 17, 2023 18:57 13s
Use env variable Check for merge conflicts #223: Commit 4734a96 pushed by yubiuser
April 17, 2023 18:57 50s tweak/stale
tweak/stale
April 17, 2023 18:57 50s
Trigger stale workflow on issue comments to remove stale label immediately Check for merge conflicts #222: Pull request #350 synchronize by yubiuser
April 16, 2023 17:02 9s
April 16, 2023 17:02 9s
Run seperate job to trigger removal on comments Check for merge conflicts #221: Commit 1c057b4 pushed by yubiuser
April 16, 2023 17:02 12s tweak/stale
tweak/stale
April 16, 2023 17:02 12s
Add update option Check for merge conflicts #220: Pull request #343 synchronize by strangelookingnerd
April 15, 2023 13:59 13s
April 15, 2023 13:59 13s
PADD v3.11.0 Check for merge conflicts #219: Pull request #338 synchronize by yubiuser
April 15, 2023 12:38 2m 10s
April 15, 2023 12:38 2m 10s
Bump actions/checkout from 3.5.0 to 3.5.2 (#351) Check for merge conflicts #218: Commit 5f9ab06 pushed by yubiuser
April 15, 2023 12:38 2m 12s development
development
April 15, 2023 12:38 2m 12s
Bump actions/checkout from 3.5.0 to 3.5.2 Check for merge conflicts #217: Commit 5831d2c pushed by dependabot bot
April 15, 2023 10:57 12s dependabot/github_actions/development/actions/checkout-3.5.2
dependabot/github_actions/development/actions/checkout-3.5.2
April 15, 2023 10:57 12s
Trigger stale workflow on issue comments to remove stale label immedi… Check for merge conflicts #216: Commit 80a2fac pushed by yubiuser
April 15, 2023 08:34 13s tweak/stale
tweak/stale
April 15, 2023 08:34 13s
Add update option Check for merge conflicts #215: Pull request #343 synchronize by strangelookingnerd
April 14, 2023 14:53 13s
April 14, 2023 14:53 13s
Add update option Check for merge conflicts #214: Pull request #343 synchronize by strangelookingnerd
April 14, 2023 13:23 12s
April 14, 2023 13:23 12s
Add update option Check for merge conflicts #213: Pull request #343 synchronize by strangelookingnerd
April 14, 2023 13:23 12s
April 14, 2023 13:23 12s
[WIP] Make PADD compatible with FTLv6 Check for merge conflicts #212: Pull request #247 synchronize by yubiuser
April 7, 2023 12:03 18s
April 7, 2023 12:03 18s
Merge branch 'development' into PADD_FTLv6 Check for merge conflicts #211: Commit 70977ee pushed by yubiuser
April 7, 2023 12:03 17s PADD_FTLv6
PADD_FTLv6
April 7, 2023 12:03 17s
PADD v3.11.0 Check for merge conflicts #210: Pull request #338 synchronize by yubiuser
April 7, 2023 11:23 2m 10s
April 7, 2023 11:23 2m 10s
Fix empty temp sensor files (#341) Check for merge conflicts #209: Commit 95e6b2d pushed by yubiuser
April 7, 2023 11:23 2m 15s development
development
April 7, 2023 11:23 2m 15s
PADD v3.11.0 Check for merge conflicts #208: Pull request #338 synchronize by yubiuser
April 7, 2023 11:20 14s
April 7, 2023 11:20 14s
Reset ftl_version_heatmap after use (#345) Check for merge conflicts #207: Commit 1778193 pushed by yubiuser
April 7, 2023 11:20 2m 12s development
development
April 7, 2023 11:20 2m 12s