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,146 workflow run results
1,146 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Development v6 Check for merge conflicts #1816: Pull request #3019 synchronize by rdwebdesign
June 1, 2024 16:13 11s
June 1, 2024 16:13 11s
DHCP Settings - add option to ignore unknown DHCP clients (#3035) Check for merge conflicts #1815: Commit 6fafc94 pushed by rdwebdesign
June 1, 2024 16:13 2m 9s development-v6
development-v6
June 1, 2024 16:13 2m 9s
Development v6 Check for merge conflicts #1814: Pull request #3019 synchronize by yubiuser
June 1, 2024 11:06 2m 11s
June 1, 2024 11:06 2m 11s
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 (#3041) Check for merge conflicts #1813: Commit c94e7e2 pushed by yubiuser
June 1, 2024 11:06 2m 14s development-v6
development-v6
June 1, 2024 11:06 2m 14s
Bump phpstan/phpstan from 1.11.2 to 1.11.3 (#3040) Check for merge conflicts #1812: Commit 9c5695c pushed by yubiuser
June 1, 2024 11:03 2m 11s devel
devel
June 1, 2024 11:03 2m 11s
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 Check for merge conflicts #1811: Commit 5757932 pushed by dependabot bot
June 1, 2024 10:57 10s dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.2
dependabot/github_actions/development-v6/eps1lon/actions-label-merge-conflict-3.0.2
June 1, 2024 10:57 10s
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 (#3037) Check for merge conflicts #1810: Commit a9151ff pushed by yubiuser
June 1, 2024 10:46 2m 11s devel
devel
June 1, 2024 10:46 2m 11s
Bump phpstan/phpstan from 1.11.2 to 1.11.3 Check for merge conflicts #1809: Commit 8ea5a99 pushed by dependabot bot
June 1, 2024 10:32 10s dependabot/composer/devel/phpstan/phpstan-1.11.3
dependabot/composer/devel/phpstan/phpstan-1.11.3
June 1, 2024 10:32 10s
Bump datatables.net-bs from 1.10.21 to 2.0.8 Check for merge conflicts #1808: Commit 7448014 pushed by dependabot bot
June 1, 2024 10:18 14s dependabot/npm_and_yarn/development-v6/datatables.net-bs-2.0.8
dependabot/npm_and_yarn/development-v6/datatables.net-bs-2.0.8
June 1, 2024 10:18 14s
Bump datatables.net-select-bs from 1.3.1 to 2.0.3 Check for merge conflicts #1807: Commit ee2ab22 pushed by dependabot bot
June 1, 2024 10:17 14s dependabot/npm_and_yarn/development-v6/datatables.net-select-bs-2.0.3
dependabot/npm_and_yarn/development-v6/datatables.net-select-bs-2.0.3
June 1, 2024 10:17 14s
Bump eps1lon/actions-label-merge-conflict from 3.0.1 to 3.0.2 Check for merge conflicts #1806: Commit 6d2655c pushed by dependabot bot
June 1, 2024 10:11 10s dependabot/github_actions/devel/eps1lon/actions-label-merge-conflict-3.0.2
dependabot/github_actions/devel/eps1lon/actions-label-merge-conflict-3.0.2
June 1, 2024 10:11 10s
DHCP Settings - add option to ignore unknown DHCP clients Check for merge conflicts #1805: Pull request #3035 synchronize by rdwebdesign
May 31, 2024 20:35 13s
May 31, 2024 20:35 13s
Rewording and better format for the last sentence Check for merge conflicts #1804: Commit 09d7aa5 pushed by rdwebdesign
May 31, 2024 20:35 11s new/dhcp_ignoreUnknownClients
new/dhcp_ignoreUnknownClients
May 31, 2024 20:35 11s
DHCP Settings - add option to ignore unknown DHCP clients Check for merge conflicts #1803: Commit f0fc7b0 pushed by rdwebdesign
May 31, 2024 19:56 12s new/dhcp_ignoreUnknownClients
new/dhcp_ignoreUnknownClients
May 31, 2024 19:56 12s
Fix (and simplify) mass deletion of DHCP lease, diagnosis messages, a… Check for merge conflicts #1802: Commit d2ef955 pushed by DL6ER
May 30, 2024 10:44 12s fix/mass_delete
fix/mass_delete
May 30, 2024 10:44 12s
Fix (and simplify) mass deletion of DHCP lease, diagnosis messages, a… Check for merge conflicts #1801: Commit 9c97a8c pushed by DL6ER
May 30, 2024 10:41 11s fix/mass_delete
fix/mass_delete
May 30, 2024 10:41 11s
Development v6 Check for merge conflicts #1800: Pull request #3019 synchronize by PromoFaux
May 28, 2024 18:24 2m 11s
May 28, 2024 18:24 2m 11s
Bump chart.js from 4.4.2 to 4.4.3 (#3027) Check for merge conflicts #1799: Commit 24977e8 pushed by PromoFaux
May 28, 2024 18:24 2m 11s development-v6
development-v6
May 28, 2024 18:24 2m 11s
Bump phpstan/phpstan from 1.11.1 to 1.11.2 (#3033) Check for merge conflicts #1798: Commit 3e1d5c9 pushed by yubiuser
May 25, 2024 19:35 2m 11s devel
devel
May 25, 2024 19:35 2m 11s
Bump phpstan/phpstan from 1.11.1 to 1.11.2 Check for merge conflicts #1797: Pull request #3033 synchronize by yubiuser
May 25, 2024 19:32 11s
May 25, 2024 19:32 11s
Fix codespell Check for merge conflicts #1796: Commit 49cfdc9 pushed by yubiuser
May 25, 2024 19:32 10s dependabot/composer/devel/phpstan/phpstan-1.11.2
dependabot/composer/devel/phpstan/phpstan-1.11.2
May 25, 2024 19:32 10s
Bump phpstan/phpstan from 1.11.1 to 1.11.2 Check for merge conflicts #1795: Commit 4582359 pushed by dependabot bot
May 25, 2024 10:24 11s dependabot/composer/devel/phpstan/phpstan-1.11.2
dependabot/composer/devel/phpstan/phpstan-1.11.2
May 25, 2024 10:24 11s
Development v6 Check for merge conflicts #1794: Pull request #3019 synchronize by rdwebdesign
May 23, 2024 19:43 2m 10s
May 23, 2024 19:43 2m 10s
Remove the small-box glow effect on text updates to avoid visual is… Check for merge conflicts #1793: Commit 59b1dcf pushed by rdwebdesign
May 23, 2024 19:43 2m 12s development-v6
development-v6
May 23, 2024 19:43 2m 12s
Remove the small-box glow effect on text updates Check for merge conflicts #1792: Commit a1df7bd pushed by rdwebdesign
May 23, 2024 01:56 10s remove_glow
remove_glow
May 23, 2024 01:56 10s