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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Pi-hole v6.0 documentation Check for merge conflicts #1118: Pull request #338 synchronize by DL6ER
November 9, 2024 07:35 2m 12s
November 9, 2024 07:35 2m 12s
Merge branch 'master' into release/v6.0 Check for merge conflicts #1117: Commit 3836980 pushed by DL6ER
November 9, 2024 07:35 13s release/v6.0
release/v6.0
November 9, 2024 07:35 13s
Merge pull request #1127 from pi-hole/dependabot/pip/master/pip-depen… Check for merge conflicts #1116: Commit 77d4108 pushed by yubiuser
November 2, 2024 10:39 2m 10s master
master
November 2, 2024 10:39 2m 10s
Bump mkdocs-material from 9.5.42 to 9.5.43 in the pip-dependencies group Check for merge conflicts #1115: Commit babbea8 pushed by dependabot bot
November 2, 2024 10:35 10s dependabot/pip/master/pip-dependencies-0610082a93
dependabot/pip/master/pip-dependencies-0610082a93
November 2, 2024 10:35 10s
Pi-hole v6.0 documentation Check for merge conflicts #1114: Pull request #338 synchronize by yubiuser
November 2, 2024 10:11 12s
November 2, 2024 10:11 12s
Merge pull request #1126 from pi-hole/dependabot/pip/release/v6.0/pip… Check for merge conflicts #1113: Commit d16a433 pushed by yubiuser
November 2, 2024 10:11 2m 9s release/v6.0
release/v6.0
November 2, 2024 10:11 2m 9s
Bump mkdocs-material from 9.5.42 to 9.5.43 in the pip-dependencies group Check for merge conflicts #1112: Commit bfddfe5 pushed by dependabot bot
November 2, 2024 10:02 10s dependabot/pip/release/v6.0/pip-dependencies-0610082a93
dependabot/pip/release/v6.0/pip-dependencies-0610082a93
November 2, 2024 10:02 10s
Update docs/ftldns/dnsmasq_warn.md Check for merge conflicts #1111: Commit 67f7d0f pushed by PromoFaux
October 29, 2024 11:30 13s remove-restartdns
remove-restartdns
October 29, 2024 11:30 13s
Update docs to remove/replace outdated references Check for merge conflicts #1110: Pull request #1099 synchronize by PromoFaux
October 29, 2024 11:30 11s
October 29, 2024 11:30 11s
Update docs to remove/replace outdated references Check for merge conflicts #1109: Pull request #1099 synchronize by PromoFaux
October 28, 2024 16:57 9s
October 28, 2024 16:57 9s
Fix mkdocs yaml Check for merge conflicts #1108: Commit 6aec290 pushed by PromoFaux
October 28, 2024 16:57 9s remove-restartdns
remove-restartdns
October 28, 2024 16:57 9s
Update docs to remove/replace outdated references Check for merge conflicts #1107: Pull request #1099 synchronize by PromoFaux
October 28, 2024 16:56 13s
October 28, 2024 16:56 13s
Review comments Check for merge conflicts #1106: Commit 252aced pushed by PromoFaux
October 28, 2024 16:56 10s remove-restartdns
remove-restartdns
October 28, 2024 16:56 10s
Update docs to remove/replace outdated references Check for merge conflicts #1105: Pull request #1099 synchronize by PromoFaux
October 28, 2024 16:52 13s
October 28, 2024 16:52 13s
Add reloadDNS/lists to hte pihole-command page Check for merge conflicts #1104: Commit b49eaa9 pushed by PromoFaux
October 28, 2024 16:52 11s remove-restartdns
remove-restartdns
October 28, 2024 16:52 11s
Merge pull request #1125 from pi-hole/dependabot/github_actions/maste… Check for merge conflicts #1103: Commit e0efc36 pushed by yubiuser
October 26, 2024 12:14 2m 10s master
master
October 26, 2024 12:14 2m 10s
Bump the github_action-dependencies group with 3 updates Check for merge conflicts #1102: Pull request #1125 synchronize by yubiuser
October 26, 2024 12:13 11s
October 26, 2024 12:13 11s
Bump the github_action-dependencies group with 3 updates Check for merge conflicts #1101: Commit f33142c pushed by yubiuser
October 26, 2024 12:13 14s dependabot/github_actions/master/github_action-dependencies-042d55de69
dependabot/github_actions/master/github_action-dependencies-042d55de69
October 26, 2024 12:13 14s
Merge pull request #1124 from pi-hole/dependabot/pip/master/pip-depen… Check for merge conflicts #1100: Commit d2e93a1 pushed by yubiuser
October 26, 2024 12:13 2m 12s master
master
October 26, 2024 12:13 2m 12s
Pi-hole v6.0 documentation Check for merge conflicts #1099: Pull request #338 synchronize by yubiuser
October 26, 2024 12:12 12s
October 26, 2024 12:12 12s
Merge pull request #1123 from pi-hole/dependabot/pip/release/v6.0/pip… Check for merge conflicts #1098: Commit e62a86a pushed by yubiuser
October 26, 2024 12:12 2m 13s release/v6.0
release/v6.0
October 26, 2024 12:12 2m 13s
Pi-hole v6.0 documentation Check for merge conflicts #1097: Pull request #338 synchronize by yubiuser
October 26, 2024 12:09 2m 9s
October 26, 2024 12:09 2m 9s
Merge pull request #1122 from pi-hole/dependabot/github_actions/relea… Check for merge conflicts #1096: Commit 421f355 pushed by yubiuser
October 26, 2024 12:09 12s release/v6.0
release/v6.0
October 26, 2024 12:09 12s
Bump the github_action-dependencies group with 3 updates Check for merge conflicts #1095: Commit d0f144a pushed by dependabot bot
October 26, 2024 10:30 10s dependabot/github_actions/master/github_action-dependencies-042d55de69
dependabot/github_actions/master/github_action-dependencies-042d55de69
October 26, 2024 10:30 10s
Bump the pip-dependencies group with 2 updates Check for merge conflicts #1094: Commit bd6a760 pushed by dependabot bot
October 26, 2024 10:28 10s dependabot/pip/master/pip-dependencies-51ab7d45ad
dependabot/pip/master/pip-dependencies-51ab7d45ad
October 26, 2024 10:28 10s