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,146 workflow run results
1,146 workflow run results

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump actions/setup-node from 4.0.1 to 4.0.3 (#3075) Check for merge conflicts #1941: Commit 50a9f10 pushed by yubiuser
July 13, 2024 11:10 2m 13s devel
devel
July 13, 2024 11:10 2m 13s
Bump actions/setup-node from 4.0.1 to 4.0.3 Check for merge conflicts #1940: Commit ded85fc pushed by dependabot bot
July 13, 2024 10:33 11s dependabot/github_actions/devel/actions/setup-node-4.0.3
dependabot/github_actions/devel/actions/setup-node-4.0.3
July 13, 2024 10:33 11s
Development v6 Check for merge conflicts #1939: Pull request #3019 synchronize by yubiuser
July 13, 2024 10:26 2m 11s
July 13, 2024 10:26 2m 11s
Bump actions/setup-node from 4.0.2 to 4.0.3 (#3074) Check for merge conflicts #1938: Commit 9d8a3df pushed by yubiuser
July 13, 2024 10:26 2m 14s development-v6
development-v6
July 13, 2024 10:26 2m 14s
Bump actions/setup-node from 4.0.2 to 4.0.3 Check for merge conflicts #1937: Commit eebd1b7 pushed by dependabot bot
July 13, 2024 10:23 10s dependabot/github_actions/development-v6/actions/setup-node-4.0.3
dependabot/github_actions/development-v6/actions/setup-node-4.0.3
July 13, 2024 10:23 10s
Bump xo from 0.56.0 to 0.58.0 Check for merge conflicts #1936: Commit b4437bb pushed by dependabot bot
July 13, 2024 10:13 13s dependabot/npm_and_yarn/development-v6/xo-0.58.0
dependabot/npm_and_yarn/development-v6/xo-0.58.0
July 13, 2024 10:13 13s
Make the tables for TopClients & TopDomains behave like graph for ClientsOverTime Check for merge conflicts #1935: Pull request #3072 synchronize by mwoolweaver
July 9, 2024 00:27 10s
July 9, 2024 00:27 10s
Development v6 Check for merge conflicts #1934: Pull request #3019 synchronize by yubiuser
July 8, 2024 18:59 10s
July 8, 2024 18:59 10s
Don't try to fill client/domain tables if there is no data (#3069) Check for merge conflicts #1933: Commit 60ca1c7 pushed by yubiuser
July 8, 2024 18:59 2m 10s development-v6
development-v6
July 8, 2024 18:59 2m 10s
Don't try to fill client/domain tables if there is no data Check for merge conflicts #1932: Pull request #3069 synchronize by yubiuser
July 8, 2024 18:56 11s
July 8, 2024 18:56 11s
Don't try to fill client/domain tables if there is no data Check for merge conflicts #1931: Commit 337d7e5 pushed by yubiuser
July 8, 2024 18:56 9s fix/privacy
fix/privacy
July 8, 2024 18:56 9s
Don't try to fill client/domain tables if there is no data Check for merge conflicts #1930: Pull request #3069 synchronize by yubiuser
July 8, 2024 18:53 13s
July 8, 2024 18:53 13s
Hide overlay Check for merge conflicts #1929: Commit 400f142 pushed by yubiuser
July 8, 2024 18:53 11s fix/privacy
fix/privacy
July 8, 2024 18:53 11s
Don't try to fill client/domain tables if there is no data Check for merge conflicts #1928: Pull request #3069 synchronize by yubiuser
July 8, 2024 18:46 13s
July 8, 2024 18:46 13s
Apply suggestions from code review Check for merge conflicts #1927: Commit 1897f68 pushed by yubiuser
July 8, 2024 18:46 10s fix/privacy
fix/privacy
July 8, 2024 18:46 10s
Don't try to fill client/domain tables if there is no data Check for merge conflicts #1926: Pull request #3069 synchronize by yubiuser
July 8, 2024 18:40 10s
July 8, 2024 18:40 10s
Don't try to fill client/domain tables if there is no data Check for merge conflicts #1925: Commit 33cdb85 pushed by yubiuser
July 8, 2024 18:40 9s fix/privacy
fix/privacy
July 8, 2024 18:40 9s
Don't try to fill client/domain tables if there is no data Check for merge conflicts #1924: Commit b0adb98 pushed by yubiuser
July 8, 2024 18:30 10s fix/privacy
fix/privacy
July 8, 2024 18:30 10s
Bump phpstan/phpstan from 1.11.4 to 1.11.7 (#3067) Check for merge conflicts #1923: Commit 5e0b98d pushed by yubiuser
July 7, 2024 20:08 2m 14s devel
devel
July 7, 2024 20:08 2m 14s
Bump phpstan/phpstan from 1.11.4 to 1.11.7 Check for merge conflicts #1922: Commit 00482c5 pushed by dependabot bot
July 7, 2024 19:57 10s dependabot/composer/devel/phpstan/phpstan-1.11.7
dependabot/composer/devel/phpstan/phpstan-1.11.7
July 7, 2024 19:57 10s
Bump postcss from 8.4.38 to 8.4.39 (#3064) Check for merge conflicts #1921: Commit bd2ca34 pushed by yubiuser
July 7, 2024 19:57 2m 10s devel
devel
July 7, 2024 19:57 2m 10s
Bump postcss from 8.4.38 to 8.4.39 Check for merge conflicts #1920: Pull request #3064 synchronize by yubiuser
July 7, 2024 19:11 10s
July 7, 2024 19:11 10s
I can't belive this was not noticed for 8 years Check for merge conflicts #1919: Commit a2abe61 pushed by yubiuser
July 7, 2024 19:11 10s dependabot/npm_and_yarn/devel/postcss-8.4.39
dependabot/npm_and_yarn/devel/postcss-8.4.39
July 7, 2024 19:11 10s
Development v6 Check for merge conflicts #1918: Pull request #3019 synchronize by yubiuser
July 6, 2024 11:59 2m 11s
July 6, 2024 11:59 2m 11s
Bump postcss from 8.4.38 to 8.4.39 (#3066) Check for merge conflicts #1917: Commit e852fbb pushed by yubiuser
July 6, 2024 11:59 11s development-v6
development-v6
July 6, 2024 11:59 11s