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,134 workflow runs
1,134 workflow runs
Event

Filter by event

Loading
Status

Filter by status

Loading
Branch
Actor

Filter by actor

Loading
Do not use CLI password when no password is set at all Check for merge conflicts #1705: Commit 25f384a pushed by DL6ER
June 20, 2024 17:42 11s new/cli_pw
new/cli_pw
June 20, 2024 17:42 11s
Rewrite list functions to use the API Check for merge conflicts #1704: Commit bfc18f8 pushed by DL6ER
June 20, 2024 16:45 13s new/cli_pw
new/cli_pw
June 20, 2024 16:45 13s
Bump pytest from 8.2.1 to 8.2.2 in /test Check for merge conflicts #1703: Pull request #5680 synchronize by dependabot bot
June 15, 2024 18:23 9s
June 15, 2024 18:23 9s
Bump pytest from 8.2.1 to 8.2.2 in /test Check for merge conflicts #1702: Commit 9690877 pushed by dependabot bot
June 15, 2024 18:23 13s dependabot/pip/test/development/pytest-8.2.2
dependabot/pip/test/development/pytest-8.2.2
June 15, 2024 18:23 13s
Development v6 Check for merge conflicts #1701: Pull request #5100 synchronize by yubiuser
June 15, 2024 12:20 18s
June 15, 2024 12:20 18s
Bump actions/checkout from 4.1.6 to 4.1.7 (#5687) Check for merge conflicts #1700: Commit ca9eaf9 pushed by yubiuser
June 15, 2024 12:20 2m 10s development-v6
development-v6
June 15, 2024 12:20 2m 10s
Bump actions/checkout from 4.1.6 to 4.1.7 (#5686) Check for merge conflicts #1699: Commit 1e6fe9c pushed by yubiuser
June 15, 2024 12:16 2m 11s development
development
June 15, 2024 12:16 2m 11s
Bump actions/checkout from 4.1.6 to 4.1.7 Check for merge conflicts #1698: Commit 5d2cb55 pushed by dependabot bot
June 15, 2024 10:25 11s dependabot/github_actions/development-v6/actions/checkout-4.1.7
dependabot/github_actions/development-v6/actions/checkout-4.1.7
June 15, 2024 10:25 11s
Bump actions/checkout from 4.1.6 to 4.1.7 Check for merge conflicts #1697: Commit fdd5b5c pushed by dependabot bot
June 15, 2024 10:14 10s dependabot/github_actions/development/actions/checkout-4.1.7
dependabot/github_actions/development/actions/checkout-4.1.7
June 15, 2024 10:14 10s
Development v6 Check for merge conflicts #1696: Pull request #5100 synchronize by yubiuser
June 8, 2024 17:28 12s
June 8, 2024 17:28 12s
Remove CentOS8 from test suite (#5682) Check for merge conflicts #1695: Commit 81e628a pushed by yubiuser
June 8, 2024 17:28 2m 10s development-v6
development-v6
June 8, 2024 17:28 2m 10s
Development v6 Check for merge conflicts #1694: Pull request #5100 synchronize by yubiuser
June 8, 2024 12:34 11s
June 8, 2024 12:34 11s
Bump pytest from 8.2.1 to 8.2.2 in /test (#5679) Check for merge conflicts #1693: Commit 4a1dd7f pushed by yubiuser
June 8, 2024 12:34 2m 18s development-v6
development-v6
June 8, 2024 12:34 2m 18s
Remove CentOS8 from test suite Check for merge conflicts #1692: Commit cfc0d07 pushed by yubiuser
June 8, 2024 10:57 12s centos8
centos8
June 8, 2024 10:57 12s
Bump pytest from 8.2.1 to 8.2.2 in /test Check for merge conflicts #1691: Pull request #5679 synchronize by dependabot bot
June 8, 2024 10:57 10s
June 8, 2024 10:57 10s
Bump pytest from 8.2.1 to 8.2.2 in /test Check for merge conflicts #1690: Commit 0742c01 pushed by dependabot bot
June 8, 2024 10:57 9s dependabot/pip/test/development-v6/pytest-8.2.2
dependabot/pip/test/development-v6/pytest-8.2.2
June 8, 2024 10:57 9s
Development v6 Check for merge conflicts #1689: Pull request #5100 synchronize by yubiuser
June 8, 2024 10:56 2m 10s
June 8, 2024 10:56 2m 10s
Bump tox from 4.15.0 to 4.15.1 in /test (#5678) Check for merge conflicts #1688: Commit c1d6bcb pushed by yubiuser
June 8, 2024 10:56 2m 13s development-v6
development-v6
June 8, 2024 10:56 2m 13s
Bump tox from 4.15.0 to 4.15.1 in /test Check for merge conflicts #1687: Commit 56f5e24 pushed by dependabot bot
June 8, 2024 10:34 12s dependabot/pip/test/development/tox-4.15.1
dependabot/pip/test/development/tox-4.15.1
June 8, 2024 10:34 12s
Bump pytest from 8.2.1 to 8.2.2 in /test Check for merge conflicts #1686: Commit a3d7769 pushed by dependabot bot
June 8, 2024 10:34 11s dependabot/pip/test/development/pytest-8.2.2
dependabot/pip/test/development/pytest-8.2.2
June 8, 2024 10:34 11s
Bump pytest from 8.2.1 to 8.2.2 in /test Check for merge conflicts #1685: Commit 6e323d7 pushed by dependabot bot
June 8, 2024 10:16 11s dependabot/pip/test/development-v6/pytest-8.2.2
dependabot/pip/test/development-v6/pytest-8.2.2
June 8, 2024 10:16 11s
Bump tox from 4.15.0 to 4.15.1 in /test Check for merge conflicts #1684: Commit 2fdb655 pushed by dependabot bot
June 8, 2024 10:15 10s dependabot/pip/test/development-v6/tox-4.15.1
dependabot/pip/test/development-v6/tox-4.15.1
June 8, 2024 10:15 10s
Development v6 Check for merge conflicts #1683: Pull request #5100 synchronize by DL6ER
June 8, 2024 09:00 2m 10s
June 8, 2024 09:00 2m 10s
Add CAP_SYS_TIME to FTL's ambient capabilities (#5676) Check for merge conflicts #1682: Commit dc5a7c4 pushed by DL6ER
June 8, 2024 09:00 2m 11s development-v6
development-v6
June 8, 2024 09:00 2m 11s
Add CAP_SYS_TIME to FTL's ambient capabilities Check for merge conflicts #1681: Commit e232361 pushed by DL6ER
June 7, 2024 17:02 11s new/ntp
new/ntp
June 7, 2024 17:02 11s