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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

consistent naming for forum (#3183) Check for merge conflicts #2296: Commit 51545cc pushed by yubiuser
December 16, 2024 19:46 2m 11s development
development
December 16, 2024 19:46 2m 11s
consistent naming for forum Check for merge conflicts #2295: Pull request #3183 synchronize by stonerl
December 16, 2024 19:39 10s
December 16, 2024 19:39 10s
Bump eslint-plugin-compat from 6.0.1 to 6.0.2 (#3182) Check for merge conflicts #2294: Commit 87b1977 pushed by yubiuser
December 14, 2024 10:56 2m 11s development
development
December 14, 2024 10:56 2m 11s
Bump eslint-plugin-compat from 6.0.1 to 6.0.2 Check for merge conflicts #2293: Commit 3eeacb1 pushed by dependabot bot
December 14, 2024 10:44 9s dependabot/npm_and_yarn/development/eslint-plugin-compat-6.0.2
dependabot/npm_and_yarn/development/eslint-plugin-compat-6.0.2
December 14, 2024 10:44 9s
Bump xo from 0.59.3 to 0.60.0 (#3181) Check for merge conflicts #2292: Commit 8b21935 pushed by yubiuser
December 14, 2024 10:42 2m 10s development
development
December 14, 2024 10:42 2m 10s
Bump xo from 0.59.3 to 0.60.0 Check for merge conflicts #2291: Pull request #3181 synchronize by yubiuser
December 7, 2024 15:11 10s
December 7, 2024 15:11 10s
Fix prefer-global-this error Check for merge conflicts #2290: Commit e7f97ba pushed by yubiuser
December 7, 2024 15:11 9s dependabot/npm_and_yarn/development/xo-0.60.0
dependabot/npm_and_yarn/development/xo-0.60.0
December 7, 2024 15:11 9s
Bump xo from 0.59.3 to 0.60.0 Check for merge conflicts #2289: Pull request #3181 synchronize by dependabot bot
December 7, 2024 10:21 14s
December 7, 2024 10:21 14s
Bump xo from 0.59.3 to 0.60.0 Check for merge conflicts #2288: Commit adbce75 pushed by dependabot bot
December 7, 2024 10:21 9s dependabot/npm_and_yarn/development/xo-0.60.0
dependabot/npm_and_yarn/development/xo-0.60.0
December 7, 2024 10:21 9s
Bump prettier from 3.4.1 to 3.4.2 (#3180) Check for merge conflicts #2287: Commit e57c0fb pushed by yubiuser
December 7, 2024 10:20 2m 9s development
development
December 7, 2024 10:20 2m 9s
Bump xo from 0.59.3 to 0.60.0 Check for merge conflicts #2286: Commit 18e4d87 pushed by dependabot bot
December 7, 2024 10:05 13s dependabot/npm_and_yarn/development/xo-0.60.0
dependabot/npm_and_yarn/development/xo-0.60.0
December 7, 2024 10:05 13s
Bump prettier from 3.4.1 to 3.4.2 Check for merge conflicts #2285: Commit deea83b pushed by dependabot bot
December 7, 2024 10:05 8s dependabot/npm_and_yarn/development/prettier-3.4.2
dependabot/npm_and_yarn/development/prettier-3.4.2
December 7, 2024 10:05 8s
Bump chart.js from 4.4.6 to 4.4.7 (#3179) Check for merge conflicts #2284: Commit 8cd680e pushed by yubiuser
December 5, 2024 12:24 2m 14s development
development
December 5, 2024 12:24 2m 14s
Bump chart.js from 4.4.6 to 4.4.7 Check for merge conflicts #2283: Pull request #3179 synchronize by yubiuser
December 5, 2024 12:22 11s
December 5, 2024 12:22 11s
Update chartjs files Check for merge conflicts #2282: Commit 2de2a7f pushed by yubiuser
December 5, 2024 12:22 13s dependabot/npm_and_yarn/development/chart.js-4.4.7
dependabot/npm_and_yarn/development/chart.js-4.4.7
December 5, 2024 12:22 13s
Bump chart.js from 4.4.6 to 4.4.7 Check for merge conflicts #2281: Commit c9f0d31 pushed by dependabot bot
December 1, 2024 18:06 9s dependabot/npm_and_yarn/development/chart.js-4.4.7
dependabot/npm_and_yarn/development/chart.js-4.4.7
December 1, 2024 18:06 9s
Bump datatables.net-buttons-bs from 1.7.1 to 3.2.0 Check for merge conflicts #2280: Pull request #3172 synchronize by dependabot bot
November 29, 2024 22:06 12s
November 29, 2024 22:06 12s
Bump datatables.net-buttons-bs from 1.7.1 to 3.2.0 Check for merge conflicts #2279: Commit 2ca996e pushed by dependabot bot
November 29, 2024 22:06 10s dependabot/npm_and_yarn/development/datatables.net-buttons-bs-3.2.0
dependabot/npm_and_yarn/development/datatables.net-buttons-bs-3.2.0
November 29, 2024 22:06 10s
Bump chartjs-plugin-zoom from 2.0.1 to 2.2.0 (#3177) Check for merge conflicts #2278: Commit 9f9c26c pushed by yubiuser
November 29, 2024 22:05 2m 18s development
development
November 29, 2024 22:05 2m 18s
Bump prettier from 3.3.3 to 3.4.1 (#3178) Check for merge conflicts #2277: Commit 96f9ee6 pushed by yubiuser
November 27, 2024 21:21 2m 9s development
development
November 27, 2024 21:21 2m 9s
Bump chartjs-plugin-zoom from 2.0.1 to 2.2.0 Check for merge conflicts #2276: Pull request #3177 synchronize by yubiuser
November 27, 2024 21:19 12s
November 27, 2024 21:19 12s
Adjust onZoom callback to not trigger on chart.zoomScale introduced i… Check for merge conflicts #2275: Commit 4277311 pushed by yubiuser
November 27, 2024 21:19 11s dependabot/npm_and_yarn/development/chartjs-plugin-zoom-2.2.0
dependabot/npm_and_yarn/development/chartjs-plugin-zoom-2.2.0
November 27, 2024 21:19 11s
Bump chartjs-plugin-zoom from 2.0.1 to 2.2.0 Check for merge conflicts #2274: Pull request #3177 synchronize by yubiuser
November 27, 2024 21:18 11s
November 27, 2024 21:18 11s
Adjust onZoom callback to not trigger on chart.zoomScale introduced i… Check for merge conflicts #2273: Commit 401a63c pushed by yubiuser
November 27, 2024 21:18 11s dependabot/npm_and_yarn/development/chartjs-plugin-zoom-2.2.0
dependabot/npm_and_yarn/development/chartjs-plugin-zoom-2.2.0
November 27, 2024 21:18 11s
Bump chartjs-plugin-zoom from 2.0.1 to 2.2.0 Check for merge conflicts #2272: Pull request #3177 synchronize by yubiuser
November 27, 2024 21:17 9s
November 27, 2024 21:17 9s