Skip to content

Actions: FreeTubeApp/FreeTube

Actions

Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
4,053 workflow runs
4,053 workflow runs

Filter by Event

Loading

Filter by Status

Loading

Filter by Branch

Loading

Filter by Actor

Loading
Bump the stylelint group with 2 updates (#5411) Conflicts #7245: Commit 10c7aae pushed by FreeTubeBot
July 18, 2024 16:28 2m 21s development
development
July 18, 2024 16:28 2m 21s
Migrate video player from video.js to shaka-player Conflicts #7244: Pull request #4978 synchronize by absidue
July 17, 2024 20:59 19s
July 17, 2024 20:59 19s
Migrate video player from video.js to shaka-player Conflicts #7243: Pull request #4978 synchronize by absidue
July 16, 2024 19:45 19s
July 16, 2024 19:45 19s
Bump the stylelint group with 2 updates Conflicts #7242: Pull request #5411 synchronize by PikachuEXE
July 16, 2024 01:46 9s
July 16, 2024 01:46 9s
* Run yarn run lint-style-fix twice Conflicts #7241: Commit b06d1e5 pushed by PikachuEXE
July 16, 2024 01:46 10s dependabot/npm_and_yarn/stylelint-e30a2f5b40
dependabot/npm_and_yarn/stylelint-e30a2f5b40
July 16, 2024 01:46 10s
Bump the stylelint group with 2 updates Conflicts #7240: Pull request #5411 synchronize by dependabot bot
July 15, 2024 18:46 11s
July 15, 2024 18:46 11s
Bump the stylelint group with 2 updates Conflicts #7239: Commit 296300f pushed by dependabot bot
July 15, 2024 18:46 13s dependabot/npm_and_yarn/stylelint-e30a2f5b40
dependabot/npm_and_yarn/stylelint-e30a2f5b40
July 15, 2024 18:46 13s
Bump rimraf from 5.0.8 to 6.0.1 (#5412) Conflicts #7238: Commit c1a7149 pushed by FreeTubeBot
July 15, 2024 18:43 2m 16s development
development
July 15, 2024 18:43 2m 16s
Translated using Weblate (Indonesian) Conflicts #7237: Commit 079b116 pushed by weblate
July 15, 2024 16:09 2m 15s development
development
July 15, 2024 16:09 2m 15s
Bump the stylelint group with 2 updates Conflicts #7236: Pull request #5411 synchronize by dependabot bot
July 15, 2024 13:12 13s
July 15, 2024 13:12 13s
Bump the stylelint group with 2 updates Conflicts #7235: Commit 07cb2e9 pushed by dependabot bot
July 15, 2024 13:12 14s dependabot/npm_and_yarn/stylelint-e30a2f5b40
dependabot/npm_and_yarn/stylelint-e30a2f5b40
July 15, 2024 13:12 14s
Bump the babel group across 1 directory with 3 updates (#5419) Conflicts #7234: Commit 37e82fc pushed by FreeTubeBot
July 15, 2024 13:10 2m 15s development
development
July 15, 2024 13:10 2m 15s
Bump the stylelint group with 2 updates Conflicts #7233: Pull request #5411 synchronize by dependabot bot
July 15, 2024 12:51 5m 37s
July 15, 2024 12:51 5m 37s
Bump the stylelint group with 2 updates Conflicts #7232: Commit 22b14ea pushed by dependabot bot
July 15, 2024 12:51 5m 41s dependabot/npm_and_yarn/stylelint-e30a2f5b40
dependabot/npm_and_yarn/stylelint-e30a2f5b40
July 15, 2024 12:51 5m 41s
Bump the babel group across 1 directory with 3 updates Conflicts #7231: Commit e7c10b1 pushed by dependabot bot
July 15, 2024 12:50 6m 8s dependabot/npm_and_yarn/babel-de6f8dd18b
dependabot/npm_and_yarn/babel-de6f8dd18b
July 15, 2024 12:50 6m 8s
Bump rimraf from 5.0.8 to 6.0.1 Conflicts #7230: Pull request #5412 synchronize by dependabot bot
July 15, 2024 12:50 6m 1s
July 15, 2024 12:50 6m 1s
Bump rimraf from 5.0.8 to 6.0.1 Conflicts #7229: Commit 89341c7 pushed by dependabot bot
July 15, 2024 12:50 6m 2s dependabot/npm_and_yarn/rimraf-6.0.1
dependabot/npm_and_yarn/rimraf-6.0.1
July 15, 2024 12:50 6m 2s
Bump sass from 1.77.6 to 1.77.8 (#5413) Conflicts #7228: Commit 84756d4 pushed by FreeTubeBot
July 15, 2024 12:49 3m 45s development
development
July 15, 2024 12:49 3m 45s
Bump webpack from 5.92.1 to 5.93.0 (#5414) Conflicts #7227: Commit 17fdb45 pushed by FreeTubeBot
July 15, 2024 12:48 14s development
development
July 15, 2024 12:48 14s
Bump lefthook from 1.7.1 to 1.7.2 (#5415) Conflicts #7226: Commit a846226 pushed by FreeTubeBot
July 15, 2024 12:48 2m 15s development
development
July 15, 2024 12:48 2m 15s
Bump electron from 31.1.0 to 31.2.0 (#5416) Conflicts #7225: Commit 1046e23 pushed by FreeTubeBot
July 15, 2024 12:48 4m 14s development
development
July 15, 2024 12:48 4m 14s
Bump electron from 31.1.0 to 31.2.0 Conflicts #7224: Commit 557bd06 pushed by dependabot bot
July 15, 2024 08:41 12s dependabot/npm_and_yarn/electron-31.2.0
dependabot/npm_and_yarn/electron-31.2.0
July 15, 2024 08:41 12s
Bump lefthook from 1.7.1 to 1.7.2 Conflicts #7223: Commit 11cccf9 pushed by dependabot bot
July 15, 2024 08:40 13s dependabot/npm_and_yarn/lefthook-1.7.2
dependabot/npm_and_yarn/lefthook-1.7.2
July 15, 2024 08:40 13s
Bump webpack from 5.92.1 to 5.93.0 Conflicts #7222: Commit 0a2a495 pushed by dependabot bot
July 15, 2024 08:40 11s dependabot/npm_and_yarn/webpack-5.93.0
dependabot/npm_and_yarn/webpack-5.93.0
July 15, 2024 08:40 11s
Bump sass from 1.77.6 to 1.77.8 Conflicts #7221: Commit 09cac9e pushed by dependabot bot
July 15, 2024 08:38 11s dependabot/npm_and_yarn/sass-1.77.8
dependabot/npm_and_yarn/sass-1.77.8
July 15, 2024 08:38 11s