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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Update actual files Check for merge conflicts #2232: Commit 5a48c35 pushed by yubiuser
October 29, 2024 15:31 14s dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.6.0
dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.6.0
October 29, 2024 15:31 14s
Bump bootstrap from 3.4.1 to 5.3.3 Check for merge conflicts #2231: Pull request #3168 synchronize by dependabot bot
October 29, 2024 14:17 15s
October 29, 2024 14:17 15s
Bump bootstrap from 3.4.1 to 5.3.3 Check for merge conflicts #2230: Commit 7e9fbd0 pushed by dependabot bot
October 29, 2024 14:17 11s dependabot/npm_and_yarn/development/bootstrap-5.3.3
dependabot/npm_and_yarn/development/bootstrap-5.3.3
October 29, 2024 14:17 11s
Bump @fortawesome/fontawesome-free from 6.3.0 to 6.6.0 Check for merge conflicts #2229: Pull request #3167 synchronize by dependabot bot
October 29, 2024 14:17 11s
October 29, 2024 14:17 11s
Bump @fortawesome/fontawesome-free from 6.3.0 to 6.6.0 Check for merge conflicts #2228: Commit caf1d1b pushed by dependabot bot
October 29, 2024 14:17 18s dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.6.0
dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.6.0
October 29, 2024 14:17 18s
Bump icheck-material from 1.0.0 to 1.0.1 (#3169) Check for merge conflicts #2227: Commit c689fdc pushed by yubiuser
October 29, 2024 14:16 2m 13s development
development
October 29, 2024 14:16 2m 13s
Bump icheck-material from 1.0.0 to 1.0.1 Check for merge conflicts #2226: Pull request #3169 synchronize by yubiuser
October 29, 2024 14:15 10s
October 29, 2024 14:15 10s
Update the version info in the file as the authors did not do this so… Check for merge conflicts #2225: Commit 755abea pushed by yubiuser
October 29, 2024 14:15 14s dependabot/npm_and_yarn/development/icheck-material-1.0.1
dependabot/npm_and_yarn/development/icheck-material-1.0.1
October 29, 2024 14:15 14s
Bump icheck-material from 1.0.0 to 1.0.1 Check for merge conflicts #2224: Commit 3824eb2 pushed by dependabot bot
October 29, 2024 13:56 11s dependabot/npm_and_yarn/development/icheck-material-1.0.1
dependabot/npm_and_yarn/development/icheck-material-1.0.1
October 29, 2024 13:56 11s
Bump bootstrap from 3.4.1 to 5.3.3 Check for merge conflicts #2223: Commit cc57017 pushed by dependabot bot
October 29, 2024 13:55 11s dependabot/npm_and_yarn/development/bootstrap-5.3.3
dependabot/npm_and_yarn/development/bootstrap-5.3.3
October 29, 2024 13:55 11s
Bump @fortawesome/fontawesome-free from 6.3.0 to 6.6.0 Check for merge conflicts #2222: Commit d615178 pushed by dependabot bot
October 29, 2024 13:55 11s dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.6.0
dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.6.0
October 29, 2024 13:55 11s
Bump datatables.net-bs from 1.10.21 to 2.1.8 Check for merge conflicts #2221: Pull request #3156 synchronize by dependabot bot
October 29, 2024 09:50 15s
October 29, 2024 09:50 15s
Bump datatables.net-bs from 1.10.21 to 2.1.8 Check for merge conflicts #2220: Commit 90b5bd5 pushed by dependabot bot
October 29, 2024 09:50 11s dependabot/npm_and_yarn/development/datatables.net-bs-2.1.8
dependabot/npm_and_yarn/development/datatables.net-bs-2.1.8
October 29, 2024 09:50 11s
Tweak (vendor) folder structure (#3166) Check for merge conflicts #2219: Commit 1d337f8 pushed by yubiuser
October 29, 2024 09:49 2m 13s development
development
October 29, 2024 09:49 2m 13s
Bump admin-lte from 2.4.18 to 3.2.0 Check for merge conflicts #2218: Pull request #3133 synchronize by dependabot bot
October 28, 2024 20:09 11s
October 28, 2024 20:09 11s
Bump admin-lte from 2.4.18 to 3.2.0 Check for merge conflicts #2217: Commit 3403348 pushed by dependabot bot
October 28, 2024 20:09 9s dependabot/npm_and_yarn/development/admin-lte-3.2.0
dependabot/npm_and_yarn/development/admin-lte-3.2.0
October 28, 2024 20:09 9s
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