Skip to content

Actions: pi-hole/web

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

v6 placeholder Check for merge conflicts #2351: Pull request #3190 synchronize by yubiuser
January 26, 2025 05:34 2m 9s
January 26, 2025 05:34 2m 9s
Bump actions/stale from 9.0.0 to 9.1.0 (#3199) Check for merge conflicts #2350: Commit 98696d4 pushed by yubiuser
January 26, 2025 05:34 2m 11s development
development
January 26, 2025 05:34 2m 11s
Bump datatables.net-buttons-bs from 1.7.1 to 3.2.1 Check for merge conflicts #2349: Commit 8fdc6f6 pushed by dependabot bot
January 25, 2025 10:17 9s dependabot/npm_and_yarn/development/datatables.net-buttons-bs-3.2.1
dependabot/npm_and_yarn/development/datatables.net-buttons-bs-3.2.1
January 25, 2025 10:17 9s
Bump actions/stale from 9.0.0 to 9.1.0 Check for merge conflicts #2348: Commit efe9ed8 pushed by dependabot bot
January 25, 2025 10:12 12s dependabot/github_actions/development/actions/stale-9.1.0
dependabot/github_actions/development/actions/stale-9.1.0
January 25, 2025 10:12 12s
Tweak bar colors used by "Total queries" graphic Check for merge conflicts #2347: Pull request #3198 synchronize by rdwebdesign
January 24, 2025 20:40 12s
January 24, 2025 20:40 12s
Use CSS properties to define colors for each theme Check for merge conflicts #2346: Commit 2d68446 pushed by rdwebdesign
January 24, 2025 20:40 8s tweak/graph_bar_colors
tweak/graph_bar_colors
January 24, 2025 20:40 8s
Use CSS properties to define colors for each theme Check for merge conflicts #2345: Commit bd7c4bf pushed by rdwebdesign
January 24, 2025 20:15 13s tweak/graph_bar_colors
tweak/graph_bar_colors
January 24, 2025 20:15 13s
Use CSS properties to define colors for each theme Check for merge conflicts #2344: Commit d38c1ad pushed by rdwebdesign
January 24, 2025 19:55 12s tweak/graph_bar_colors
tweak/graph_bar_colors
January 24, 2025 19:55 12s
Use CSS properties to define colors for each theme Check for merge conflicts #2343: Commit 6041fbc pushed by rdwebdesign
January 24, 2025 00:30 12s tweak/graph_bar_colors
tweak/graph_bar_colors
January 24, 2025 00:30 12s
v6 placeholder Check for merge conflicts #2342: Pull request #3190 synchronize by DL6ER
January 21, 2025 20:32 2m 10s
January 21, 2025 20:32 2m 10s
Use new dnssec.color instead of the removed dnssecClass variable (#3197) Check for merge conflicts #2341: Commit 9913f88 pushed by DL6ER
January 21, 2025 20:32 12s development
development
January 21, 2025 20:32 12s
Use new dnssec.color instead of the removed dnssecClass variable Check for merge conflicts #2340: Commit c56578b pushed by DL6ER
January 21, 2025 18:37 8s fix/dnssecClass
fix/dnssecClass
January 21, 2025 18:37 8s
v6 placeholder Check for merge conflicts #2339: Pull request #3190 synchronize by DL6ER
January 20, 2025 17:01 11s
January 20, 2025 17:01 11s
Show DNSSEC status icon (if applicable) (#3185) Check for merge conflicts #2338: Commit 37fcb78 pushed by DL6ER
January 20, 2025 17:01 2m 10s development
development
January 20, 2025 17:01 2m 10s
v6 placeholder Check for merge conflicts #2337: Pull request #3190 synchronize by yubiuser
January 18, 2025 11:11 9s
January 18, 2025 11:11 9s
Bump postcss from 8.4.49 to 8.5.1 (#3196) Check for merge conflicts #2336: Commit 76e6a35 pushed by yubiuser
January 18, 2025 11:11 2m 10s development
development
January 18, 2025 11:11 2m 10s
Bump postcss from 8.4.49 to 8.5.1 Check for merge conflicts #2335: Commit a1ab8ce pushed by dependabot bot
January 18, 2025 11:00 11s dependabot/npm_and_yarn/development/postcss-8.5.1
dependabot/npm_and_yarn/development/postcss-8.5.1
January 18, 2025 11:00 11s
v6 placeholder Check for merge conflicts #2334: Pull request #3190 synchronize by yubiuser
January 11, 2025 14:01 12s
January 11, 2025 14:01 12s
Bump eps1lon/actions-label-merge-conflict from 3.0.2 to 3.0.3 (#3192) Check for merge conflicts #2333: Commit 603f35d pushed by yubiuser
January 11, 2025 14:01 2m 10s development
development
January 11, 2025 14:01 2m 10s
Bump datatables.net-select-bs from 1.3.1 to 3.0.0 Check for merge conflicts #2332: Commit ae504ad pushed by dependabot bot
January 11, 2025 10:44 12s dependabot/npm_and_yarn/development/datatables.net-select-bs-3.0.0
dependabot/npm_and_yarn/development/datatables.net-select-bs-3.0.0
January 11, 2025 10:44 12s
Bump datatables.net-bs from 1.10.21 to 2.2.1 Check for merge conflicts #2331: Commit bca6d52 pushed by dependabot bot
January 11, 2025 10:44 11s dependabot/npm_and_yarn/development/datatables.net-bs-2.2.1
dependabot/npm_and_yarn/development/datatables.net-bs-2.2.1
January 11, 2025 10:44 11s
Bump eps1lon/actions-label-merge-conflict from 3.0.2 to 3.0.3 Check for merge conflicts #2330: Commit 94045fe pushed by dependabot bot
January 11, 2025 10:18 10s dependabot/github_actions/development/eps1lon/actions-label-merge-conflict-3.0.3
dependabot/github_actions/development/eps1lon/actions-label-merge-conflict-3.0.3
January 11, 2025 10:18 10s
Add possibility to assign groups to newly added entries from the begi… Check for merge conflicts #2329: Commit be86950 pushed by DL6ER
January 3, 2025 09:35 2m 10s development
development
January 3, 2025 09:35 2m 10s
Add possibility to assign groups to newly added entries from the beginning Check for merge conflicts #2328: Pull request #3187 synchronize by DL6ER
January 2, 2025 11:42 8s
January 2, 2025 11:42 8s
Tweak CSS used to format Group Assignment control (#3188) Check for merge conflicts #2327: Commit ad3a553 pushed by DL6ER
January 2, 2025 11:42 12s new/group_assign
new/group_assign
January 2, 2025 11:42 12s