Skip to content

Actions: FreeTubeApp/FreeTube-Docs

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
92 workflow runs
92 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Bump just-the-docs from 0.11.1 to 0.12.0 Conflicts #596: Commit 5d549ec pushed by dependabot bot
9s dependabot/bundler/just-the-docs-0.12.0
dependabot/bundler/just-the-docs-0.12.0
9s
Add googlevideo to the local API dependencies Conflicts #595: Pull request #170 synchronize by absidue
9s
9s
Bump just-the-docs from 0.10.1 to 0.11.1 (#202) Conflicts #594: Commit aec7f02 pushed by FreeTubeBot
2m 9s master
master
2m 9s
Bump just-the-docs from 0.10.1 to 0.11.1 Conflicts #593: Commit 0c1c2c1 pushed by dependabot bot
6s dependabot/bundler/just-the-docs-0.11.1
dependabot/bundler/just-the-docs-0.11.1
6s
Fix typo in page: faq (#201) Conflicts #592: Commit b8b2ffa pushed by FreeTubeBot
2m 9s master
master
2m 9s
Fix a typo in FAQ page Conflicts #591: Pull request #201 synchronize by codeswhite
6s
6s
Bump peter-evans/create-pull-request from 7 to 8 (#199) Conflicts #590: Commit 304351d pushed by FreeTubeBot
5m 39s master
master
5m 39s
Bump peter-evans/create-pull-request from 7 to 8 Conflicts #589: Commit c7eb794 pushed by dependabot bot
7s dependabot/github_actions/peter-evans/create-pull-request-8
dependabot/github_actions/peter-evans/create-pull-request-8
7s
Bump actions/checkout from 5 to 6 (#198) Conflicts #588: Commit d9a847b pushed by FreeTubeBot
2m 8s master
master
2m 8s
Bump actions/checkout from 5 to 6 Conflicts #587: Commit 00c5fb2 pushed by dependabot bot
9s dependabot/github_actions/actions/checkout-6
dependabot/github_actions/actions/checkout-6
9s
Remove vue-portal from the list of dependencies (#197) Conflicts #586: Commit a02b323 pushed by FreeTubeBot
2m 9s master
master
2m 9s
Update guide and dependency links to the Vue 3 versions (#193) Conflicts #585: Commit 038c1aa pushed by FreeTubeBot
2m 11s master
master
2m 11s
Change Takeout importing steps (#196) Conflicts #584: Commit 12fb46c pushed by FreeTubeBot
2m 10s master
master
2m 10s
Remove broken restart window keyboard shortcut (#172) Conflicts #583: Commit 31ac35e pushed by FreeTubeBot
2m 7s master
master
2m 7s
add playlist shortcuts (#195) Conflicts #582: Commit feb284b pushed by FreeTubeBot
4m 10s master
master
4m 10s
Change Takeout importing steps Conflicts #581: Pull request #196 synchronize by efb4f5ff-1298-471a-8973-3d47447115dc
10s
10s
Bump github/codeql-action from 3 to 4 (#194) Conflicts #580: Commit 015caee pushed by FreeTubeBot
2m 8s master
master
2m 8s
Bump github/codeql-action from 3 to 4 Conflicts #579: Commit f5cbcd9 pushed by dependabot bot
8s dependabot/github_actions/github/codeql-action-4
dependabot/github_actions/github/codeql-action-4
8s
Add googlevideo to the local API dependencies Conflicts #578: Pull request #170 synchronize by absidue
8s
8s
Compressed Images (#191) Conflicts #577: Commit 8ced14c pushed by FreeTubeBot
2m 10s master
master
2m 10s
Compressed Images (#190) Conflicts #576: Commit 1522525 pushed by FreeTubeBot
2m 8s master
master
2m 8s
Bump rexml from 3.4.0 to 3.4.2 (#189) Conflicts #575: Commit e7f102d pushed by FreeTubeBot
2m 7s master
master
2m 7s
Compressed Images (#188) Conflicts #574: Commit fa74f36 pushed by FreeTubeBot
2m 8s master
master
2m 8s
Bump rexml from 3.4.0 to 3.4.2 Conflicts #573: Commit c466800 pushed by dependabot bot
9s dependabot/bundler/rexml-3.4.2
dependabot/bundler/rexml-3.4.2
9s
Bump actions/labeler from 5 to 6 (#186) Conflicts #572: Commit a5e00c1 pushed by FreeTubeBot
2m 10s master
master
2m 10s