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

Bump prettier from 3.3.1 to 3.3.2 Check for merge conflicts #1866: Commit 1dedeb3 pushed by dependabot bot
June 15, 2024 10:42 10s dependabot/npm_and_yarn/devel/prettier-3.3.2
dependabot/npm_and_yarn/devel/prettier-3.3.2
June 15, 2024 10:42 10s
Bump actions/checkout from 4.1.6 to 4.1.7 Check for merge conflicts #1865: Commit eb2d20d pushed by dependabot bot
June 15, 2024 10:28 14s dependabot/github_actions/development-v6/actions/checkout-4.1.7
dependabot/github_actions/development-v6/actions/checkout-4.1.7
June 15, 2024 10:28 14s
Bump actions/checkout from 4.1.6 to 4.1.7 Check for merge conflicts #1864: Commit 713ffa4 pushed by dependabot bot
June 15, 2024 10:24 11s dependabot/github_actions/devel/actions/checkout-4.1.7
dependabot/github_actions/devel/actions/checkout-4.1.7
June 15, 2024 10:24 11s
Bump eslint-plugin-compat from 4.2.0 to 5.0.0 Check for merge conflicts #1863: Commit 6634914 pushed by dependabot bot
June 15, 2024 10:05 10s dependabot/npm_and_yarn/development-v6/eslint-plugin-compat-5.0.0
dependabot/npm_and_yarn/development-v6/eslint-plugin-compat-5.0.0
June 15, 2024 10:05 10s
Bump prettier from 3.3.1 to 3.3.2 Check for merge conflicts #1862: Commit a3129af pushed by dependabot bot
June 15, 2024 10:05 10s dependabot/npm_and_yarn/development-v6/prettier-3.3.2
dependabot/npm_and_yarn/development-v6/prettier-3.3.2
June 15, 2024 10:05 10s
Show warning if user already set an application password Check for merge conflicts #1861: Commit 3681d71 pushed by DL6ER
June 15, 2024 09:25 11s tweak/warn_apppw
tweak/warn_apppw
June 15, 2024 09:25 11s
Bump prettier from 3.1.1 to 3.3.1 (#3047) Check for merge conflicts #1860: Commit 14ed85c pushed by yubiuser
June 8, 2024 12:31 2m 10s devel
devel
June 8, 2024 12:31 2m 10s
Bump phpstan/phpstan from 1.11.3 to 1.11.4 (#3046) Check for merge conflicts #1859: Commit 3733fbc pushed by yubiuser
June 8, 2024 12:27 2m 12s devel
devel
June 8, 2024 12:27 2m 12s
Development v6 Check for merge conflicts #1858: Pull request #3019 synchronize by yubiuser
June 8, 2024 10:49 12s
June 8, 2024 10:49 12s
Bump prettier from 3.2.5 to 3.3.1 (#3045) Check for merge conflicts #1857: Commit 4349f68 pushed by yubiuser
June 8, 2024 10:49 2m 9s development-v6
development-v6
June 8, 2024 10:49 2m 9s
Bump prettier from 3.1.1 to 3.3.1 Check for merge conflicts #1856: Commit 32fdfa9 pushed by dependabot bot
June 8, 2024 10:39 9s dependabot/npm_and_yarn/devel/prettier-3.3.1
dependabot/npm_and_yarn/devel/prettier-3.3.1
June 8, 2024 10:39 9s
Bump phpstan/phpstan from 1.11.3 to 1.11.4 Check for merge conflicts #1855: Commit d75e758 pushed by dependabot bot
June 8, 2024 10:28 9s dependabot/composer/devel/phpstan/phpstan-1.11.4
dependabot/composer/devel/phpstan/phpstan-1.11.4
June 8, 2024 10:28 9s
Bump prettier from 3.2.5 to 3.3.1 Check for merge conflicts #1854: Commit d08aef4 pushed by dependabot bot
June 8, 2024 10:06 10s dependabot/npm_and_yarn/development-v6/prettier-3.3.1
dependabot/npm_and_yarn/development-v6/prettier-3.3.1
June 8, 2024 10:06 10s
Show sensor line only if data.sensors.cpu_temp is available Check for merge conflicts #1853: Commit ed71e0b pushed by rdwebdesign
June 7, 2024 00:49 14s hide_null_temp
hide_null_temp
June 7, 2024 00:49 14s
Development v6 Check for merge conflicts #1852: Pull request #3019 synchronize by rdwebdesign
June 6, 2024 22:13 13s
June 6, 2024 22:13 13s
New layout for "All Settings" page (#3042) Check for merge conflicts #1851: Commit 5b6c8bb pushed by rdwebdesign
June 6, 2024 22:13 2m 14s development-v6
development-v6
June 6, 2024 22:13 2m 14s
Development v6 Check for merge conflicts #1850: Pull request #3019 synchronize by DL6ER
June 6, 2024 17:44 2m 11s
June 6, 2024 17:44 2m 11s
Fix multi-deletion of DHCP leases (#2792) Check for merge conflicts #1849: Commit 4402d56 pushed by DL6ER
June 6, 2024 17:44 15s development-v6
development-v6
June 6, 2024 17:44 15s
Apply suggestions from code review Check for merge conflicts #1848: Commit 61acb4a pushed by DL6ER
June 6, 2024 07:01 13s fix/del_dhcp_leases
fix/del_dhcp_leases
June 6, 2024 07:01 13s
Fix multi-deletion of DHCP leases Check for merge conflicts #1847: Pull request #2792 synchronize by DL6ER
June 6, 2024 07:01 14s
June 6, 2024 07:01 14s
New layout for "All Settings" page Check for merge conflicts #1846: Pull request #3042 synchronize by rdwebdesign
June 5, 2024 23:32 11s
June 5, 2024 23:32 11s
Adapt the style to LCARS theme Check for merge conflicts #1845: Commit 20fc994 pushed by rdwebdesign
June 5, 2024 23:32 13s new/settings_all_layout
new/settings_all_layout
June 5, 2024 23:32 13s
New layout for "All Settings" page Check for merge conflicts #1844: Pull request #3042 synchronize by rdwebdesign
June 5, 2024 23:22 9s
June 5, 2024 23:22 9s
Adapt the style to LCARS theme Check for merge conflicts #1843: Commit 6303c2d pushed by rdwebdesign
June 5, 2024 23:22 12s new/settings_all_layout
new/settings_all_layout
June 5, 2024 23:22 12s
Development v6 Check for merge conflicts #1842: Pull request #3019 synchronize by PromoFaux
June 5, 2024 20:15 14s
June 5, 2024 20:15 14s