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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump chartjs-plugin-zoom from 2.0.1 to 2.1.0 Check for merge conflicts #2257: Pull request #3173 synchronize by yubiuser
November 19, 2024 07:59 12s
November 19, 2024 07:59 12s
Update chartjs-plugin-zoom file Check for merge conflicts #2256: Commit 8b2c8ef pushed by yubiuser
November 19, 2024 07:59 10s dependabot/npm_and_yarn/development/chartjs-plugin-zoom-2.1.0
dependabot/npm_and_yarn/development/chartjs-plugin-zoom-2.1.0
November 19, 2024 07:59 10s
Bump chartjs-plugin-zoom from 2.0.1 to 2.1.0 Check for merge conflicts #2255: Pull request #3173 synchronize by dependabot bot
November 19, 2024 07:55 9s
November 19, 2024 07:55 9s
Bump chartjs-plugin-zoom from 2.0.1 to 2.1.0 Check for merge conflicts #2254: Commit 2c022cd pushed by dependabot bot
November 19, 2024 07:55 10s dependabot/npm_and_yarn/development/chartjs-plugin-zoom-2.1.0
dependabot/npm_and_yarn/development/chartjs-plugin-zoom-2.1.0
November 19, 2024 07:55 10s
Bump bootstrap from 3.4.1 to 5.3.3 Check for merge conflicts #2253: Pull request #3168 synchronize by dependabot bot
November 19, 2024 07:47 12s
November 19, 2024 07:47 12s
Bump datatables.net-buttons-bs from 1.7.1 to 3.2.0 Check for merge conflicts #2252: Pull request #3172 synchronize by dependabot bot
November 19, 2024 07:47 12s
November 19, 2024 07:47 12s
Bump datatables.net-buttons-bs from 1.7.1 to 3.2.0 Check for merge conflicts #2251: Commit 35b957e pushed by dependabot bot
November 19, 2024 07:47 9s 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 19, 2024 07:47 9s
Bump bootstrap from 3.4.1 to 5.3.3 Check for merge conflicts #2250: Commit 691a02c pushed by dependabot bot
November 19, 2024 07:47 11s dependabot/npm_and_yarn/development/bootstrap-5.3.3
dependabot/npm_and_yarn/development/bootstrap-5.3.3
November 19, 2024 07:47 11s
Bump @fortawesome/fontawesome-free from 6.6.0 to 6.7.0 (#3174) Check for merge conflicts #2249: Commit d5d5138 pushed by yubiuser
November 19, 2024 07:46 2m 14s development
development
November 19, 2024 07:46 2m 14s
Bump @fortawesome/fontawesome-free from 6.6.0 to 6.7.0 Check for merge conflicts #2248: Pull request #3174 synchronize by yubiuser
November 19, 2024 07:20 11s
November 19, 2024 07:20 11s
Update fontawesome file Check for merge conflicts #2247: Commit 798ab07 pushed by yubiuser
November 19, 2024 07:20 16s dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.7.0
dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.7.0
November 19, 2024 07:20 16s
Bump @fortawesome/fontawesome-free from 6.6.0 to 6.7.0 Check for merge conflicts #2246: Commit 698de95 pushed by dependabot bot
November 19, 2024 07:11 10s dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.7.0
dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.7.0
November 19, 2024 07:11 10s
Bump bootstrap from 3.4.1 to 5.3.3 Check for merge conflicts #2245: Pull request #3168 synchronize by dependabot bot
November 19, 2024 07:09 9s
November 19, 2024 07:09 9s
Bump datatables.net-buttons-bs from 1.7.1 to 3.2.0 Check for merge conflicts #2244: Pull request #3172 synchronize by dependabot bot
November 19, 2024 07:09 13s
November 19, 2024 07:09 13s
Bump datatables.net-buttons-bs from 1.7.1 to 3.2.0 Check for merge conflicts #2243: Commit 5b967e6 pushed by dependabot bot
November 19, 2024 07:09 11s 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 19, 2024 07:09 11s
Bump bootstrap from 3.4.1 to 5.3.3 Check for merge conflicts #2242: Commit 62d0f38 pushed by dependabot bot
November 19, 2024 07:09 10s dependabot/npm_and_yarn/development/bootstrap-5.3.3
dependabot/npm_and_yarn/development/bootstrap-5.3.3
November 19, 2024 07:09 10s
Bump @fortawesome/fontawesome-free from 6.3.0 to 6.6.0 (#3167) Check for merge conflicts #2241: Commit 9bf292d pushed by yubiuser
November 19, 2024 07:08 2m 13s development
development
November 19, 2024 07:08 2m 13s
Bump chartjs-plugin-zoom from 2.0.1 to 2.1.0 Check for merge conflicts #2240: Commit c2a9e7a pushed by dependabot bot
November 19, 2024 06:09 9s dependabot/npm_and_yarn/development/chartjs-plugin-zoom-2.1.0
dependabot/npm_and_yarn/development/chartjs-plugin-zoom-2.1.0
November 19, 2024 06:09 9s
Bump postcss from 8.4.47 to 8.4.49 (#3171) Check for merge conflicts #2239: Commit 56bc672 pushed by yubiuser
November 18, 2024 10:47 2m 15s development
development
November 18, 2024 10:47 2m 15s
Bump datatables.net-buttons-bs from 1.7.1 to 3.2.0 Check for merge conflicts #2238: Commit 18697b3 pushed by dependabot bot
November 16, 2024 10:25 9s 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 16, 2024 10:25 9s
Bump postcss from 8.4.47 to 8.4.49 Check for merge conflicts #2237: Commit 920a774 pushed by dependabot bot
November 16, 2024 10:25 9s dependabot/npm_and_yarn/development/postcss-8.4.49
dependabot/npm_and_yarn/development/postcss-8.4.49
November 16, 2024 10:25 9s
Display update information of individual components only if we are not running in a Docker container Check for merge conflicts #2236: Pull request #3170 synchronize by yubiuser
November 1, 2024 20:58 10s
November 1, 2024 20:58 10s
Display update information of individual components only if we are no… Check for merge conflicts #2235: Commit 664e2da pushed by yubiuser
November 1, 2024 20:58 9s no_update_docker
no_update_docker
November 1, 2024 20:58 9s
Display update information of individual components only if we are no… Check for merge conflicts #2234: Commit 5bfc894 pushed by yubiuser
November 1, 2024 20:53 9s no_update_docker
no_update_docker
November 1, 2024 20:53 9s
Bump @fortawesome/fontawesome-free from 6.3.0 to 6.6.0 Check for merge conflicts #2233: Pull request #3167 synchronize by yubiuser
October 29, 2024 15:31 10s
October 29, 2024 15:31 10s