Skip to content

Actions: pi-hole/pi-hole

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
1,122 workflow runs
1,122 workflow runs

Filter by Event

Loading

Filter by Status

Loading

Filter by Branch

Loading

Filter by Actor

Loading
Remove obsolet files Check for merge conflicts #1790: Commit 012f2bd pushed by yubiuser
July 27, 2024 20:25 10s cleanup
cleanup
July 27, 2024 20:25 10s
Remove obsolet getFTLPIDFile() Check for merge conflicts #1789: Pull request #5710 synchronize by yubiuser
July 27, 2024 20:01 9s
July 27, 2024 20:01 9s
Remove obsolet getFTLPIDFile() Check for merge conflicts #1788: Commit 2c32d48 pushed by yubiuser
July 27, 2024 20:01 9s pidfile/v6
pidfile/v6
July 27, 2024 20:01 9s
Remove obsolet getFTLPIDFile() Check for merge conflicts #1787: Commit 8ae42c4 pushed by yubiuser
July 27, 2024 19:55 11s pidfile/v6
pidfile/v6
July 27, 2024 19:55 11s
Development v6 Check for merge conflicts #1786: Pull request #5100 synchronize by yubiuser
July 27, 2024 11:45 10s
July 27, 2024 11:45 10s
Bump pytest from 8.2.2 to 8.3.2 in /test (#5709) Check for merge conflicts #1785: Commit 15d7fab pushed by yubiuser
July 27, 2024 11:45 2m 9s development-v6
development-v6
July 27, 2024 11:45 2m 9s
Bump pytest from 8.2.2 to 8.3.2 in /test (#5708) Check for merge conflicts #1784: Commit 3ca6ca5 pushed by yubiuser
July 27, 2024 11:42 2m 13s development
development
July 27, 2024 11:42 2m 13s
Bump pytest from 8.2.2 to 8.3.2 in /test Check for merge conflicts #1783: Commit 0980f9a pushed by dependabot bot
July 27, 2024 10:38 11s dependabot/pip/test/development-v6/pytest-8.3.2
dependabot/pip/test/development-v6/pytest-8.3.2
July 27, 2024 10:38 11s
Bump pytest from 8.2.2 to 8.3.2 in /test Check for merge conflicts #1782: Commit 3cc1945 pushed by dependabot bot
July 27, 2024 10:08 13s dependabot/pip/test/development/pytest-8.3.2
dependabot/pip/test/development/pytest-8.3.2
July 27, 2024 10:08 13s
Remove obsolet Debian 10 Check for merge conflicts #1781: Commit 7c8db95 pushed by yubiuser
July 26, 2024 11:19 11s remove/debian10
remove/debian10
July 26, 2024 11:19 11s
Development v6 Check for merge conflicts #1780: Pull request #5100 synchronize by DL6ER
July 23, 2024 16:04 2m 14s
July 23, 2024 16:04 2m 14s
Finish core v6 implementation (#5689) Check for merge conflicts #1779: Commit 7b980ed pushed by DL6ER
July 23, 2024 16:04 2m 14s development-v6
development-v6
July 23, 2024 16:04 2m 14s
Finish core v6 implementation Check for merge conflicts #1778: Pull request #5689 synchronize by DL6ER
July 16, 2024 09:01 11s
July 16, 2024 09:01 11s
Merge branch 'development-v6' into new/cli_pw Check for merge conflicts #1777: Commit 0614c3c pushed by DL6ER
July 16, 2024 09:01 12s new/cli_pw
new/cli_pw
July 16, 2024 09:01 12s
Finish core v6 implementation Check for merge conflicts #1776: Pull request #5689 synchronize by DL6ER
July 16, 2024 08:57 10s
July 16, 2024 08:57 10s
Implement pihole enable/disable using the API Check for merge conflicts #1775: Commit 897e230 pushed by DL6ER
July 16, 2024 08:57 11s new/cli_pw
new/cli_pw
July 16, 2024 08:57 11s
Bump actions/setup-python from 5.1.0 to 5.1.1 (#5706) Check for merge conflicts #1774: Commit 7d82b02 pushed by yubiuser
July 13, 2024 10:32 2m 10s development
development
July 13, 2024 10:32 2m 10s
Development v6 Check for merge conflicts #1773: Pull request #5100 synchronize by yubiuser
July 13, 2024 10:32 2m 12s
July 13, 2024 10:32 2m 12s
Bump actions/setup-python from 5.1.0 to 5.1.1 (#5705) Check for merge conflicts #1772: Commit b22731c pushed by yubiuser
July 13, 2024 10:32 2m 13s development-v6
development-v6
July 13, 2024 10:32 2m 13s
Bump actions/setup-python from 5.1.0 to 5.1.1 Check for merge conflicts #1771: Commit e90df12 pushed by dependabot bot
July 13, 2024 10:15 11s dependabot/github_actions/development/actions/setup-python-5.1.1
dependabot/github_actions/development/actions/setup-python-5.1.1
July 13, 2024 10:15 11s
Bump actions/setup-python from 5.1.0 to 5.1.1 Check for merge conflicts #1770: Commit bdbec05 pushed by dependabot bot
July 13, 2024 10:14 13s dependabot/github_actions/development-v6/actions/setup-python-5.1.1
dependabot/github_actions/development-v6/actions/setup-python-5.1.1
July 13, 2024 10:14 13s
Development v6 Check for merge conflicts #1769: Pull request #5100 synchronize by yubiuser
July 10, 2024 08:36 13s
July 10, 2024 08:36 13s
Fix minor spelling mistake (#5704) Check for merge conflicts #1768: Commit bffffa4 pushed by yubiuser
July 10, 2024 08:36 2m 14s development-v6
development-v6
July 10, 2024 08:36 2m 14s
Finish core v6 implementation Check for merge conflicts #1767: Pull request #5689 synchronize by DL6ER
July 8, 2024 17:18 14s
July 8, 2024 17:18 14s
Merge branch 'development-v6' into new/cli_pw Check for merge conflicts #1766: Commit 12fbf86 pushed by DL6ER
July 8, 2024 17:18 11s new/cli_pw
new/cli_pw
July 8, 2024 17:18 11s