Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
3,488 workflow runs
3,488 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Workaround for https://github.com/electron/electron/issues/49253 (#8714) Conflicts #12532: Commit a9747ce pushed by FreeTubeBot
2m 11s development
development
2m 11s
Add Parental Control toggle to disable channel link from videos Conflicts #12531: Pull request #8502 synchronize by ozrendev
10s
10s
Update shaka-player to 5.0.5 Conflicts #12530: Pull request #8772 synchronize by absidue
11s
11s
Translated using Weblate (Icelandic) Conflicts #12529: Commit db603b3 pushed by weblate
2m 8s development
development
2m 8s
Translated using Weblate (Japanese) Conflicts #12528: Commit aad620f pushed by weblate
2m 10s development
development
2m 10s
Feature: Drag and Drop Conflicts #12527: Pull request #8681 synchronize by PikachuEXE
10s
10s
Feature: Drag and Drop Conflicts #12526: Pull request #8681 synchronize by PikachuEXE
9s
9s
Trim video titles with the local API to avoid breaking the databases … Conflicts #12525: Commit 4c644ad pushed by FreeTubeBot
2m 8s development
development
2m 8s
Translated using Weblate (Tamil) Conflicts #12524: Commit 21b940b pushed by weblate
2m 8s development
development
2m 8s
Fix Up Next section missing upload date Conflicts #12523: Pull request #8773 synchronize by TaranT1
8s
8s
Migrate the WatchVideoPlaylist component to the composition API Conflicts #12522: Pull request #8762 synchronize by absidue
8s
8s
enhance issue templates (#8770) Conflicts #12521: Commit f71b960 pushed by FreeTubeBot
2m 9s development
development
2m 9s
Bump vue-i18n from 11.2.8 to 11.3.0 (#8769) Conflicts #12520: Commit a01f2f7 pushed by FreeTubeBot
2m 28s development
development
2m 28s
Bump lefthook from 2.1.2 to 2.1.3 (#8768) Conflicts #12519: Commit 2b3a8b4 pushed by FreeTubeBot
9s development
development
9s
Bump babel-loader from 10.0.0 to 10.1.0 in the babel group (#8767) Conflicts #12518: Commit 855fe90 pushed by FreeTubeBot
2m 9s development
development
2m 9s
Normalize margin at top of page Conflicts #12517: Pull request #7040 synchronize by MarmadileManteater
8s
8s
Bump vue-i18n from 11.2.8 to 11.3.0 Conflicts #12516: Commit 551f15e pushed by dependabot bot
54s dependabot/npm_and_yarn/vue-i18n-11.3.0
dependabot/npm_and_yarn/vue-i18n-11.3.0
54s
Bump lefthook from 2.1.2 to 2.1.3 Conflicts #12515: Commit 0a51d31 pushed by dependabot bot
10s dependabot/npm_and_yarn/lefthook-2.1.3
dependabot/npm_and_yarn/lefthook-2.1.3
10s
Bump babel-loader from 10.0.0 to 10.1.0 in the babel group Conflicts #12514: Commit e3afd0b pushed by dependabot bot
9s dependabot/npm_and_yarn/babel-b888110cb6
dependabot/npm_and_yarn/babel-b888110cb6
9s
Fix build script not failing on error (#8761) Conflicts #12513: Commit 0143017 pushed by FreeTubeBot
2m 9s development
development
2m 9s
Create a dependabot group for webpack dependencies (#8760) Conflicts #12512: Commit 0438401 pushed by FreeTubeBot
2m 11s development
development
2m 11s
Normalize margin at top of page Conflicts #12511: Pull request #7040 synchronize by MarmadileManteater
9s
9s
Setup playwright tests for accessibility testing Conflicts #12510: Pull request #8664 synchronize by radmorecameron
11s
11s
Translated using Weblate (Spanish) Conflicts #12509: Commit 7749ee4 pushed by weblate
2m 8s development
development
2m 8s
Bump the eslint group across 1 directory with 11 updates (#8755) Conflicts #12508: Commit 0377d41 pushed by FreeTubeBot
2m 12s development
development
2m 12s