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

Bump datatables.net-buttons-bs from 1.7.1 to 3.2.0 Check for merge conflicts #2266: Pull request #3172 synchronize by dependabot bot
November 23, 2024 18:41 9s
November 23, 2024 18:41 9s
Bump bootstrap from 3.4.1 to 5.3.3 Check for merge conflicts #2265: Pull request #3168 synchronize by dependabot bot
November 23, 2024 18:41 2m 9s
November 23, 2024 18:41 2m 9s
Bump datatables.net-buttons-bs from 1.7.1 to 3.2.0 Check for merge conflicts #2264: Commit f82fcc9 pushed by dependabot bot
November 23, 2024 18:41 59s 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 23, 2024 18:41 59s
Bump bootstrap from 3.4.1 to 5.3.3 Check for merge conflicts #2263: Commit 0bf61cf pushed by dependabot bot
November 23, 2024 18:41 1m 3s dependabot/npm_and_yarn/development/bootstrap-5.3.3
dependabot/npm_and_yarn/development/bootstrap-5.3.3
November 23, 2024 18:41 1m 3s
Bump @fortawesome/fontawesome-free from 6.7.0 to 6.7.1 (#3175) Check for merge conflicts #2262: Commit 0fdd05d pushed by yubiuser
November 23, 2024 18:40 1m 0s development
development
November 23, 2024 18:40 1m 0s
Bump @fortawesome/fontawesome-free from 6.7.0 to 6.7.1 Check for merge conflicts #2261: Pull request #3175 synchronize by yubiuser
November 23, 2024 18:35 13s
November 23, 2024 18:35 13s
Update fontawesome file Check for merge conflicts #2260: Commit 9416783 pushed by yubiuser
November 23, 2024 18:35 12s dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.7.1
dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.7.1
November 23, 2024 18:35 12s
Bump @fortawesome/fontawesome-free from 6.7.0 to 6.7.1 Check for merge conflicts #2259: Commit 14613ff pushed by dependabot bot
November 23, 2024 10:53 13s dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.7.1
dependabot/npm_and_yarn/development/fortawesome/fontawesome-free-6.7.1
November 23, 2024 10:53 13s
Display update information of individual components only if we are no… Check for merge conflicts #2258: Commit 47e977a pushed by DL6ER
November 22, 2024 17:38 2m 11s development
development
November 22, 2024 17:38 2m 11s
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