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
807 workflow runs
807 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Merge pull request #931 from pi-hole/dependabot/pip/release/v6.0/pip-… Check for merge conflicts #438: Commit b370910 pushed by yubiuser
September 16, 2023 12:58 2m 12s release/v6.0
release/v6.0
September 16, 2023 12:58 2m 12s
Bump the pip-dependencies group with 1 update Check for merge conflicts #437: Pull request #931 synchronize by yubiuser
September 16, 2023 12:57 14s
September 16, 2023 12:57 14s
Fix real spelling errors Check for merge conflicts #436: Commit f5db59a pushed by yubiuser
September 16, 2023 12:57 11s dependabot/pip/release/v6.0/pip-dependencies-f372913e8c
dependabot/pip/release/v6.0/pip-dependencies-f372913e8c
September 16, 2023 12:57 11s
Bump the pip-dependencies group with 1 update Check for merge conflicts #435: Pull request #931 synchronize by yubiuser
September 16, 2023 12:55 15s
September 16, 2023 12:55 15s
Don't run codespell on MathJax-es5 dir Check for merge conflicts #434: Commit 661b3b0 pushed by yubiuser
September 16, 2023 12:55 2m 31s dependabot/pip/release/v6.0/pip-dependencies-f372913e8c
dependabot/pip/release/v6.0/pip-dependencies-f372913e8c
September 16, 2023 12:55 2m 31s
Bump the pip-dependencies group with 1 update Check for merge conflicts #433: Commit 8f23055 pushed by dependabot bot
September 16, 2023 10:59 12s dependabot/pip/release/v6.0/pip-dependencies-f372913e8c
dependabot/pip/release/v6.0/pip-dependencies-f372913e8c
September 16, 2023 10:59 12s
Merge pull request #914 from pi-hole/no_domain Check for merge conflicts #432: Commit 35acfe9 pushed by yubiuser
September 13, 2023 04:11 2m 15s master
master
September 13, 2023 04:11 2m 15s
Remove >domain from Telnet API Check for merge conflicts #431: Pull request #914 synchronize by yubiuser
September 12, 2023 21:03 11s
September 12, 2023 21:03 11s
Remove >domain from Telnet API Check for merge conflicts #430: Commit 6a8a9c7 pushed by yubiuser
September 12, 2023 21:03 15s no_domain
no_domain
September 12, 2023 21:03 15s
Merge pull request #899 from pi-hole/group_dependabot Check for merge conflicts #429: Commit 85d7687 pushed by PromoFaux
September 10, 2023 20:00 2m 14s master
master
September 10, 2023 20:00 2m 14s
Group Dependabot pull requests by pachage ecosystem Check for merge conflicts #428: Pull request #899 synchronize by PromoFaux
September 10, 2023 11:57 12s
September 10, 2023 11:57 12s
Merge branch 'master' into group_dependabot Check for merge conflicts #427: Commit 68a9ecf pushed by PromoFaux
September 10, 2023 11:57 11s group_dependabot
group_dependabot
September 10, 2023 11:57 11s
Pi-hole v6.0 documentation Check for merge conflicts #426: Pull request #338 synchronize by yubiuser
September 9, 2023 17:58 26s
September 9, 2023 17:58 26s
Merge pull request #930 from pi-hole/dependabot/pip/release/v6.0/mkdo… Check for merge conflicts #425: Commit aaca424 pushed by yubiuser
September 9, 2023 17:58 2m 26s release/v6.0
release/v6.0
September 9, 2023 17:58 2m 26s
Pi-hole v6.0 documentation Check for merge conflicts #424: Pull request #338 synchronize by yubiuser
September 9, 2023 14:41 2m 12s
September 9, 2023 14:41 2m 12s
Merge pull request #929 from pi-hole/dependabot/github_actions/releas… Check for merge conflicts #423: Commit 5d6efcb pushed by yubiuser
September 9, 2023 14:41 16s release/v6.0
release/v6.0
September 9, 2023 14:41 16s
Bump mkdocs-material from 9.2.7 to 9.2.8 Check for merge conflicts #422: Commit 4e75aa7 pushed by dependabot bot
September 9, 2023 10:48 11s dependabot/pip/release/v6.0/mkdocs-material-9.2.8
dependabot/pip/release/v6.0/mkdocs-material-9.2.8
September 9, 2023 10:48 11s
Bump actions/checkout from 3.6.0 to 4.0.0 Check for merge conflicts #421: Commit 5ba0106 pushed by dependabot bot
September 9, 2023 10:00 14s dependabot/github_actions/release/v6.0/actions/checkout-4.0.0
dependabot/github_actions/release/v6.0/actions/checkout-4.0.0
September 9, 2023 10:00 14s
Add regex_id field of the query table Check for merge conflicts #420: Pull request #928 synchronize by DL6ER
September 8, 2023 21:07 13s
September 8, 2023 21:07 13s
Add regex_id field of the query table Check for merge conflicts #419: Commit 65f945e pushed by DL6ER
September 8, 2023 21:07 14s new/ftl_regex_id
new/ftl_regex_id
September 8, 2023 21:07 14s
Add regex_id field of the query table Check for merge conflicts #418: Commit 8f083d4 pushed by DL6ER
September 8, 2023 21:00 15s new/ftl_regex_id
new/ftl_regex_id
September 8, 2023 21:00 15s
Unattended install Check for merge conflicts #417: Pull request #927 synchronize by SK4ndal
September 7, 2023 20:33 14s
September 7, 2023 20:33 14s
Update nginx.md Check for merge conflicts #416: Pull request #926 synchronize by williamtrelawny
September 4, 2023 21:19 12s
September 4, 2023 21:19 12s
Update nginx.md Check for merge conflicts #415: Pull request #926 synchronize by williamtrelawny
September 4, 2023 21:05 13s
September 4, 2023 21:05 13s
Update nginx.md Check for merge conflicts #414: Pull request #926 synchronize by williamtrelawny
September 4, 2023 20:50 14s
September 4, 2023 20:50 14s
ProTip! You can narrow down the results and go further in time using created:<2023-09-04 or the other filters available.