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
1,626 workflow runs
1,626 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add missing dependencies to package.json - except js-warn (no npm pac… Check for merge conflicts #2216: Commit 9b261ae pushed by yubiuser
October 28, 2024 19:48 11s tweak/structure
tweak/structure
October 28, 2024 19:48 11s
Remove obsolete debug.js Check for merge conflicts #2215: Commit 9b4d03d pushed by yubiuser
October 28, 2024 19:27 9s tweak/structure
tweak/structure
October 28, 2024 19:27 9s
Bootstrap needs some special folder structure as it hard codes some p… Check for merge conflicts #2214: Commit 732932a pushed by yubiuser
October 28, 2024 19:16 13s tweak/structure
tweak/structure
October 28, 2024 19:16 13s
Unify vendor file location Check for merge conflicts #2213: Commit 4c21641 pushed by yubiuser
October 28, 2024 19:12 12s tweak/structure
tweak/structure
October 28, 2024 19:12 12s
Unify vendor file location Check for merge conflicts #2212: Commit 16144af pushed by yubiuser
October 28, 2024 19:11 10s tweak/structure
tweak/structure
October 28, 2024 19:11 10s
Unify vendor file location Check for merge conflicts #2211: Commit 77b98e5 pushed by yubiuser
October 28, 2024 19:07 10s tweak/structure
tweak/structure
October 28, 2024 19:07 10s
Unify vendor file location Check for merge conflicts #2210: Commit 71fca01 pushed by yubiuser
October 28, 2024 19:04 12s tweak/structure
tweak/structure
October 28, 2024 19:04 12s
Add missing dependencies to package.json (#3165) Check for merge conflicts #2209: Commit 8020179 pushed by yubiuser
October 28, 2024 15:41 2m 16s development
development
October 28, 2024 15:41 2m 16s
Fix gravity count when FTL fails to return this value (#3160) Check for merge conflicts #2208: Commit 74a5367 pushed by rdwebdesign
October 28, 2024 15:34 4m 2s development
development
October 28, 2024 15:34 4m 2s
Add missing dependencies to package.json Check for merge conflicts #2207: Commit 6e8731c pushed by yubiuser
October 28, 2024 15:01 14s package.json
package.json
October 28, 2024 15:01 14s
Bump chart.js from 4.4.5 to 4.4.6 (#3164) Check for merge conflicts #2206: Commit 771f328 pushed by yubiuser
October 28, 2024 14:20 2m 15s development
development
October 28, 2024 14:20 2m 15s
Bump chart.js from 4.4.5 to 4.4.6 Check for merge conflicts #2205: Pull request #3164 synchronize by yubiuser
October 28, 2024 14:19 9s
October 28, 2024 14:19 9s
Update chart.js files Check for merge conflicts #2204: Commit 55d95c6 pushed by yubiuser
October 28, 2024 14:19 10s dependabot/npm_and_yarn/development/chart.js-4.4.6
dependabot/npm_and_yarn/development/chart.js-4.4.6
October 28, 2024 14:19 10s
Bump chart.js from 4.4.5 to 4.4.6 Check for merge conflicts #2203: Commit 584f2d9 pushed by dependabot bot
October 28, 2024 14:16 12s dependabot/npm_and_yarn/development/chart.js-4.4.6
dependabot/npm_and_yarn/development/chart.js-4.4.6
October 28, 2024 14:16 12s
Fix gravity count when FTL fails to return this value Check for merge conflicts #2202: Pull request #3160 synchronize by rdwebdesign
October 27, 2024 21:56 15s
October 27, 2024 21:56 15s
Rearrange the code and use better texts in case of error Check for merge conflicts #2201: Commit 8308057 pushed by rdwebdesign
October 27, 2024 21:56 10s fix/gravity_no_count
fix/gravity_no_count
October 27, 2024 21:56 10s
Fix gravity count when FTL fails to return this value Check for merge conflicts #2200: Pull request #3160 synchronize by rdwebdesign
October 27, 2024 21:42 8s
October 27, 2024 21:42 8s
Rearrange the code and use better texts in case of error Check for merge conflicts #2199: Commit 40c5fb8 pushed by rdwebdesign
October 27, 2024 21:42 11s fix/gravity_no_count
fix/gravity_no_count
October 27, 2024 21:42 11s
Bump chart.js from 4.4.4 to 4.4.5 (#3158) Check for merge conflicts #2198: Commit 7cf66a5 pushed by yubiuser
October 26, 2024 20:15 2m 13s development
development
October 26, 2024 20:15 2m 13s
Bump actions/checkout from 4.2.1 to 4.2.2 (#3163) Check for merge conflicts #2197: Commit 45b1784 pushed by yubiuser
October 26, 2024 12:14 2m 12s development
development
October 26, 2024 12:14 2m 12s
Bump actions/setup-node from 4.0.4 to 4.1.0 (#3162) Check for merge conflicts #2196: Commit 35d3bff pushed by yubiuser
October 26, 2024 12:14 2m 13s development
development
October 26, 2024 12:14 2m 13s
Bump actions/checkout from 4.2.1 to 4.2.2 Check for merge conflicts #2195: Commit 1ac10e0 pushed by dependabot bot
October 26, 2024 10:42 10s dependabot/github_actions/development/actions/checkout-4.2.2
dependabot/github_actions/development/actions/checkout-4.2.2
October 26, 2024 10:42 10s
Bump actions/setup-node from 4.0.4 to 4.1.0 Check for merge conflicts #2194: Commit 2372a2a pushed by dependabot bot
October 26, 2024 10:42 10s dependabot/github_actions/development/actions/setup-node-4.1.0
dependabot/github_actions/development/actions/setup-node-4.1.0
October 26, 2024 10:42 10s
Remove api.localAPIauth checkbox (#3161) Check for merge conflicts #2193: Commit d0c64d8 pushed by DL6ER
October 25, 2024 19:51 2m 17s development
development
October 25, 2024 19:51 2m 17s
Remove api.localAPIauth checkbox Check for merge conflicts #2192: Commit 1e651f2 pushed by yubiuser
October 25, 2024 18:40 10s remove/localAPIauth
remove/localAPIauth
October 25, 2024 18:40 10s