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
955 workflow runs
955 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump jquery from 3.7.0 to 3.7.1 Check for merge conflicts #1488: Pull request #2904 synchronize by yubiuser
December 30, 2023 19:54 12s
December 30, 2023 19:54 12s
Update package-lock.json Check for merge conflicts #1487: Commit 96b3911 pushed by yubiuser
December 30, 2023 19:54 12s dependabot/npm_and_yarn/development-v6/jquery-3.7.1
dependabot/npm_and_yarn/development-v6/jquery-3.7.1
December 30, 2023 19:54 12s
Bump jquery from 3.7.0 to 3.7.1 Check for merge conflicts #1486: Pull request #2904 synchronize by yubiuser
December 30, 2023 19:49 14s
December 30, 2023 19:49 14s
Update jquery to 3.7.1 Check for merge conflicts #1485: Commit 296d8ac pushed by yubiuser
December 30, 2023 19:49 11s dependabot/npm_and_yarn/development-v6/jquery-3.7.1
dependabot/npm_and_yarn/development-v6/jquery-3.7.1
December 30, 2023 19:49 11s
Bump moment from 2.29.4 to 2.30.1 (#2918) Check for merge conflicts #1484: Commit 9def641 pushed by yubiuser
December 30, 2023 19:44 2m 15s development-v6
development-v6
December 30, 2023 19:44 2m 15s
Bump moment from 2.29.4 to 2.30.1 Check for merge conflicts #1483: Pull request #2918 synchronize by yubiuser
December 30, 2023 19:41 10s
December 30, 2023 19:41 10s
Update moment to 2.30.1 Check for merge conflicts #1482: Commit adaf3c2 pushed by yubiuser
December 30, 2023 19:41 11s dependabot/npm_and_yarn/development-v6/moment-2.30.1
dependabot/npm_and_yarn/development-v6/moment-2.30.1
December 30, 2023 19:41 11s
Add descriptions to DHCP metrics on the settings page Check for merge conflicts #1481: Commit 3386179 pushed by DL6ER
December 30, 2023 10:30 12s tweak/dhcp_metrics_hover
tweak/dhcp_metrics_hover
December 30, 2023 10:30 12s
Bump moment from 2.29.4 to 2.30.1 Check for merge conflicts #1480: Commit 7e1f063 pushed by dependabot bot
December 30, 2023 10:11 11s dependabot/npm_and_yarn/development-v6/moment-2.30.1
dependabot/npm_and_yarn/development-v6/moment-2.30.1
December 30, 2023 10:11 11s
Ensure blocking mode timer is started even when set via a third-party… Check for merge conflicts #1479: Commit 0076e32 pushed by DL6ER
December 27, 2023 19:39 12s fix/blocking_timer
fix/blocking_timer
December 27, 2023 19:39 12s
Query Log: Show link to groups/lists page if applicable Check for merge conflicts #1478: Commit c5ab812 pushed by DL6ER
December 25, 2023 04:32 12s tweak/list_id
tweak/list_id
December 25, 2023 04:32 12s
Bump actions/setup-node from 4.0.0 to 4.0.1 (#2915) Check for merge conflicts #1477: Commit c5c2c5b pushed by yubiuser
December 23, 2023 11:22 2m 9s development-v6
development-v6
December 23, 2023 11:22 2m 9s
Bump actions/setup-node from 4.0.0 to 4.0.1 (#2914) Check for merge conflicts #1476: Commit 5f7be30 pushed by yubiuser
December 23, 2023 10:54 2m 23s devel
devel
December 23, 2023 10:54 2m 23s
Bump actions/setup-node from 4.0.0 to 4.0.1 Check for merge conflicts #1475: Commit eb06301 pushed by dependabot bot
December 23, 2023 10:11 9s dependabot/github_actions/development-v6/actions/setup-node-4.0.1
dependabot/github_actions/development-v6/actions/setup-node-4.0.1
December 23, 2023 10:11 9s
Bump actions/setup-node from 4.0.0 to 4.0.1 Check for merge conflicts #1474: Commit a6605b5 pushed by dependabot bot
December 23, 2023 10:09 12s dependabot/github_actions/devel/actions/setup-node-4.0.1
dependabot/github_actions/devel/actions/setup-node-4.0.1
December 23, 2023 10:09 12s
Fix the red line used to identify recent entries on the log pages (#2… Check for merge conflicts #1473: Commit 8b3240e pushed by rdwebdesign
December 21, 2023 19:01 2m 12s development-v6
development-v6
December 21, 2023 19:01 2m 12s
Bump github/codeql-action from 2 to 3 (#2909) Check for merge conflicts #1472: Commit 8495f2f pushed by yubiuser
December 16, 2023 16:42 2m 13s development-v6
development-v6
December 16, 2023 16:42 2m 13s
Bump prettier from 3.1.0 to 3.1.1 (#2910) Check for merge conflicts #1471: Commit 89473e5 pushed by yubiuser
December 16, 2023 16:41 2m 23s devel
devel
December 16, 2023 16:41 2m 23s
Bump phpstan/phpstan from 1.10.48 to 1.10.50 (#2912) Check for merge conflicts #1470: Commit 85d3bf4 pushed by yubiuser
December 16, 2023 16:35 2m 11s devel
devel
December 16, 2023 16:35 2m 11s
Bump prettier from 3.1.0 to 3.1.1 (#2911) Check for merge conflicts #1469: Commit ba0b052 pushed by yubiuser
December 16, 2023 16:34 2m 10s development-v6
development-v6
December 16, 2023 16:34 2m 10s
Bump github/codeql-action from 2 to 3 (#2908) Check for merge conflicts #1468: Commit 1c7a83c pushed by yubiuser
December 16, 2023 14:10 2m 17s devel
devel
December 16, 2023 14:10 2m 17s
Bump phpstan/phpstan from 1.10.48 to 1.10.50 Check for merge conflicts #1467: Commit 5296121 pushed by dependabot bot
December 16, 2023 10:52 13s dependabot/composer/devel/phpstan/phpstan-1.10.50
dependabot/composer/devel/phpstan/phpstan-1.10.50
December 16, 2023 10:52 13s
Bump prettier from 3.1.0 to 3.1.1 Check for merge conflicts #1466: Commit abe190a pushed by dependabot bot
December 16, 2023 10:51 11s dependabot/npm_and_yarn/development-v6/prettier-3.1.1
dependabot/npm_and_yarn/development-v6/prettier-3.1.1
December 16, 2023 10:51 11s
Bump prettier from 3.1.0 to 3.1.1 Check for merge conflicts #1465: Commit ed1c000 pushed by dependabot bot
December 16, 2023 10:14 9s dependabot/npm_and_yarn/devel/prettier-3.1.1
dependabot/npm_and_yarn/devel/prettier-3.1.1
December 16, 2023 10:14 9s
Bump github/codeql-action from 2 to 3 Check for merge conflicts #1464: Commit 391f85d pushed by dependabot bot
December 16, 2023 10:04 9s dependabot/github_actions/development-v6/github/codeql-action-3
dependabot/github_actions/development-v6/github/codeql-action-3
December 16, 2023 10:04 9s
ProTip! You can narrow down the results and go further in time using created:<2023-12-16 or the other filters available.