Skip to content

Actions: pi-hole/docs

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflict.yml
57 workflow run results
57 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #911 from angelo-peronio/opendns-family-shield-ipv6 Check for merge conflicts #363: Commit c4b4965 pushed by yubiuser
August 11, 2023 15:25 2m 11s master
master
August 11, 2023 15:25 2m 11s
Remove MathJax Check for merge conflicts #362: Pull request #910 synchronize by yubiuser
August 7, 2023 20:11 11s
August 7, 2023 20:11 11s
Remove MathJax Check for merge conflicts #361: Commit 35f4e19 pushed by yubiuser
August 7, 2023 20:11 12s remove_MathJax
remove_MathJax
August 7, 2023 20:11 12s
Remove MathJax Check for merge conflicts #360: Pull request #910 synchronize by yubiuser
August 7, 2023 20:10 12s
August 7, 2023 20:10 12s
Spellcheck woke up... Check for merge conflicts #359: Commit 21b96ea pushed by yubiuser
August 7, 2023 20:10 15s remove_MathJax
remove_MathJax
August 7, 2023 20:10 15s
Remove MathJax Check for merge conflicts #358: Pull request #910 synchronize by yubiuser
August 5, 2023 13:09 13s
August 5, 2023 13:09 13s
Spellcheck woke up... Check for merge conflicts #357: Commit 399767d pushed by yubiuser
August 5, 2023 13:09 10s remove_MathJax
remove_MathJax
August 5, 2023 13:09 10s
Remove MathJax Check for merge conflicts #356: Commit b1d0f5a pushed by yubiuser
August 5, 2023 13:06 9s remove_MathJax
remove_MathJax
August 5, 2023 13:06 9s
Run dependabot on v6 branch Check for merge conflicts #355: Pull request #907 synchronize by yubiuser
August 5, 2023 11:34 11s
August 5, 2023 11:34 11s
Run dependabot on v6 branch Check for merge conflicts #354: Commit e4ae01d pushed by yubiuser
August 5, 2023 11:34 12s dependbot_v6
dependbot_v6
August 5, 2023 11:34 12s
Merge pull request #909 from pi-hole/dependabot/pip/mkdocs-1.5.2 Check for merge conflicts #353: Commit a1626b7 pushed by yubiuser
August 5, 2023 11:34 2m 10s master
master
August 5, 2023 11:34 2m 10s
Bump mkdocs from 1.5.1 to 1.5.2 Check for merge conflicts #352: Commit 0b15348 pushed by dependabot bot
August 5, 2023 10:50 11s dependabot/pip/mkdocs-1.5.2
dependabot/pip/mkdocs-1.5.2
August 5, 2023 10:50 11s
Merge pull request #908 from clwgh/master Check for merge conflicts #351: Commit 13cb7d5 pushed by DL6ER
August 5, 2023 07:18 2m 10s master
master
August 5, 2023 07:18 2m 10s
Pi-hole v6.0 documentation Check for merge conflicts #350: Pull request #338 synchronize by yubiuser
August 4, 2023 18:57 13s
August 4, 2023 18:57 13s
Exclude MathJax-es5 from editorconfig-checker Check for merge conflicts #349: Commit bff93ac pushed by yubiuser
August 4, 2023 18:57 10s release/v6.0
release/v6.0
August 4, 2023 18:57 10s
Pi-hole v6.0 documentation Check for merge conflicts #348: Pull request #338 synchronize by yubiuser
August 4, 2023 18:35 13s
August 4, 2023 18:35 13s
Merge branch 'master' into release/v6.0 Check for merge conflicts #347: Commit 94b0cbb pushed by yubiuser
August 4, 2023 18:35 12s release/v6.0
release/v6.0
August 4, 2023 18:35 12s
Pi-hole v6.0 documentation Check for merge conflicts #346: Pull request #338 synchronize by yubiuser
August 4, 2023 18:34 10s
August 4, 2023 18:34 10s
Resolve merge conflicts by updating requirements.txt Check for merge conflicts #345: Commit abb5b42 pushed by yubiuser
August 4, 2023 18:34 10s release/v6.0
release/v6.0
August 4, 2023 18:34 10s
Run dependabot on v6 branch Check for merge conflicts #344: Commit 3326333 pushed by yubiuser
August 4, 2023 18:31 12s dependbot_v6
dependbot_v6
August 4, 2023 18:31 12s
Pi-hole v6.0 documentation Check for merge conflicts #343: Pull request #338 synchronize by yubiuser
August 4, 2023 18:26 11s
August 4, 2023 18:26 11s
Add markdown-include Check for merge conflicts #342: Commit 614de8c pushed by yubiuser
August 4, 2023 18:26 10s release/v6.0
release/v6.0
August 4, 2023 18:26 10s
Pi-hole v6.0 documentation Check for merge conflicts #341: Pull request #338 synchronize by yubiuser
August 4, 2023 18:02 12s
August 4, 2023 18:02 12s
Remove webpage.sh Check for merge conflicts #340: Commit ada4762 pushed by yubiuser
August 4, 2023 18:02 11s release/v6.0
release/v6.0
August 4, 2023 18:02 11s
Merge pull request #905 from pi-hole/dependabot/pip/mkdocs-material-9… Check for merge conflicts #339: Commit 86d42c1 pushed by yubiuser
July 29, 2023 15:28 2m 10s master
master
July 29, 2023 15:28 2m 10s