Skip to content

Actions: pi-hole/web

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
966 workflow runs
966 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Sync master back into development (#3215) Check for merge conflicts #2396: Commit d6abde7 pushed by DL6ER
February 18, 2025 18:24 2m 10s development
development
February 18, 2025 18:24 2m 10s
Pi-hole web v6.0.0 (#3190) Check for merge conflicts #2395: Commit a66d859 pushed by PromoFaux
February 18, 2025 17:29 9s v6.0
v6.0
February 18, 2025 17:29 9s
Bump the npm_and_yarn group across 1 directory with 4 updates Check for merge conflicts #2394: Commit a4213bc pushed by dependabot bot
February 18, 2025 17:20 13s dependabot/npm_and_yarn/npm_and_yarn-e43c73e299
dependabot/npm_and_yarn/npm_and_yarn-e43c73e299
February 18, 2025 17:20 13s
Pi-hole web v6.0.0 (#3190) Check for merge conflicts #2393: Commit a66d859 pushed by PromoFaux
February 18, 2025 17:19 8s master
master
February 18, 2025 17:19 8s
Pi-hole web v6.0.0 Check for merge conflicts #2392: Pull request #3190 synchronize by yubiuser
February 17, 2025 17:52 2m 13s
February 17, 2025 17:52 2m 13s
Remove checkbox for database.DBexport (#3214) Check for merge conflicts #2391: Commit 5c6be28 pushed by yubiuser
February 17, 2025 17:52 2m 14s development
development
February 17, 2025 17:52 2m 14s
Use modernized waitMe plugin Check for merge conflicts #2390: Commit 5ac237b pushed by yubiuser
February 15, 2025 21:51 12s waitMe
waitMe
February 15, 2025 21:51 12s
Use new syntax Check for merge conflicts #2389: Commit 46284e6 pushed by yubiuser
February 15, 2025 21:44 10s waitMe
waitMe
February 15, 2025 21:44 10s
Use modernized waitMe plugin Check for merge conflicts #2388: Commit 3c21380 pushed by yubiuser
February 15, 2025 21:37 12s waitMe
waitMe
February 15, 2025 21:37 12s
Pi-hole web v6.0.0 Check for merge conflicts #2387: Pull request #3190 synchronize by yubiuser
February 15, 2025 21:17 2m 9s
February 15, 2025 21:17 2m 9s
Bump prettier from 3.4.2 to 3.5.1 (#3211) Check for merge conflicts #2386: Commit b743c7d pushed by yubiuser
February 15, 2025 21:17 2m 10s development
development
February 15, 2025 21:17 2m 10s
Bump prettier from 3.4.2 to 3.5.1 Check for merge conflicts #2385: Pull request #3211 synchronize by yubiuser
February 15, 2025 20:56 11s
February 15, 2025 20:56 11s
Fix prettier warnings Check for merge conflicts #2384: Commit acdc0ad pushed by yubiuser
February 15, 2025 20:56 9s dependabot/npm_and_yarn/development/prettier-3.5.1
dependabot/npm_and_yarn/development/prettier-3.5.1
February 15, 2025 20:56 9s
Bump prettier from 3.4.2 to 3.5.1 Check for merge conflicts #2383: Pull request #3211 synchronize by dependabot bot
February 15, 2025 10:28 12s
February 15, 2025 10:28 12s
Bump prettier from 3.4.2 to 3.5.1 Check for merge conflicts #2382: Commit 881a8a7 pushed by dependabot bot
February 15, 2025 10:28 12s dependabot/npm_and_yarn/development/prettier-3.5.1
dependabot/npm_and_yarn/development/prettier-3.5.1
February 15, 2025 10:28 12s
Pi-hole web v6.0.0 Check for merge conflicts #2381: Pull request #3190 synchronize by yubiuser
February 15, 2025 10:27 9s
February 15, 2025 10:27 9s
Bump postcss from 8.5.1 to 8.5.2 (#3212) Check for merge conflicts #2380: Commit 428df22 pushed by yubiuser
February 15, 2025 10:27 2m 9s development
development
February 15, 2025 10:27 2m 9s
Bump postcss from 8.5.1 to 8.5.2 Check for merge conflicts #2379: Commit 7d50459 pushed by dependabot bot
February 15, 2025 10:19 8s dependabot/npm_and_yarn/development/postcss-8.5.2
dependabot/npm_and_yarn/development/postcss-8.5.2
February 15, 2025 10:19 8s
Bump prettier from 3.4.2 to 3.5.1 Check for merge conflicts #2378: Commit fd9cce7 pushed by dependabot bot
February 15, 2025 10:19 12s dependabot/npm_and_yarn/development/prettier-3.5.1
dependabot/npm_and_yarn/development/prettier-3.5.1
February 15, 2025 10:19 12s
Bump datatables.net-bs from 1.10.21 to 2.2.2 Check for merge conflicts #2377: Commit 07ef886 pushed by dependabot bot
February 8, 2025 10:34 13s dependabot/npm_and_yarn/development/datatables.net-bs-2.2.2
dependabot/npm_and_yarn/development/datatables.net-bs-2.2.2
February 8, 2025 10:34 13s
Bump datatables.net-buttons-bs from 1.7.1 to 3.2.2 Check for merge conflicts #2376: Commit adbc84f pushed by dependabot bot
February 8, 2025 10:34 8s dependabot/npm_and_yarn/development/datatables.net-buttons-bs-3.2.2
dependabot/npm_and_yarn/development/datatables.net-buttons-bs-3.2.2
February 8, 2025 10:34 8s
Pi-hole web v6.0.0 Check for merge conflicts #2375: Pull request #3190 synchronize by rdwebdesign
February 4, 2025 20:39 2m 10s
February 4, 2025 20:39 2m 10s
Use the combination of the 2 fields in "Type" column to allow correct… Check for merge conflicts #2374: Commit 65ad66d pushed by rdwebdesign
February 4, 2025 20:39 2m 13s development
development
February 4, 2025 20:39 2m 13s
Use the combination of the 2 fields as data for the Type column Check for merge conflicts #2373: Commit 59bd009 pushed by rdwebdesign
February 4, 2025 20:26 12s fix/domain_sort
fix/domain_sort
February 4, 2025 20:26 12s
Pi-hole web v6.0.0 Check for merge conflicts #2372: Pull request #3190 synchronize by yubiuser
February 3, 2025 19:01 10s
February 3, 2025 19:01 10s