Skip to content

Actions: elan-ev/tobira

Actions

Merge conflict check

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
check-merge-conflict.yml
931 workflow runs
931 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Add "My series" page Merge conflict check #3070: Pull request #1311 synchronize by owi92
January 20, 2025 11:41 14s
January 20, 2025 11:41 14s
Fix frontend logo matching (#1318) Merge conflict check #3069: Commit d506dc3 pushed by LukasKalbertodt
January 20, 2025 11:14 2m 14s next
next
January 20, 2025 11:14 2m 14s
Add config to lock video ACLs to their series (#1305) Merge conflict check #3068: Commit bc30d35 pushed by LukasKalbertodt
January 20, 2025 11:06 2m 14s next
next
January 20, 2025 11:06 2m 14s
Refactor: add top-level model module (#1317) Merge conflict check #3067: Commit 5337026 pushed by owi92
January 20, 2025 10:39 2m 15s next
next
January 20, 2025 10:39 2m 15s
Use deploy known-* files from branch to be deployed instead of main Merge conflict check #3066: Commit d2ea178 pushed by LukasKalbertodt
January 20, 2025 10:33 2m 15s next
next
January 20, 2025 10:33 2m 15s
Add "My series" page Merge conflict check #3065: Pull request #1311 synchronize by owi92
January 20, 2025 10:05 16s
January 20, 2025 10:05 16s
Add config to lock video ACLs to their series Merge conflict check #3064: Pull request #1305 synchronize by owi92
January 17, 2025 15:45 12s
January 17, 2025 15:45 12s
Add config to lock video ACLs to their series Merge conflict check #3063: Pull request #1305 synchronize by owi92
January 17, 2025 15:45 13s
January 17, 2025 15:45 13s
Make known group labels require 'default' instead of 'en' (#1316) Merge conflict check #3062: Commit 4eded8e pushed by owi92
January 17, 2025 15:26 2m 11s next
next
January 17, 2025 15:26 2m 11s
Fix frontend logo matching Merge conflict check #3061: Pull request #1318 opened by owi92
January 17, 2025 14:11 11s
January 17, 2025 14:11 11s
Fix n+1 query problem with event.series.title (#1314) Merge conflict check #3060: Commit da131cb pushed by owi92
January 17, 2025 12:55 2m 18s next
next
January 17, 2025 12:55 2m 18s
Refactor: add top-level model module Merge conflict check #3059: Pull request #1317 opened by LukasKalbertodt
January 16, 2025 15:08 13s
January 16, 2025 15:08 13s
Make known group labels require 'default' instead of 'en' Merge conflict check #3058: Pull request #1316 opened by LukasKalbertodt
January 16, 2025 14:21 11s
January 16, 2025 14:21 11s
Add config to lock video ACLs to their series Merge conflict check #3057: Pull request #1305 synchronize by owi92
January 15, 2025 23:35 14s
January 15, 2025 23:35 14s
WIP: Debug overlay Merge conflict check #3056: Pull request #1315 opened by LukasKalbertodt
January 15, 2025 20:23 10s
January 15, 2025 20:23 10s
Fix n+1 query problem with event.series.title Merge conflict check #3055: Pull request #1314 opened by LukasKalbertodt
January 15, 2025 20:15 14s
January 15, 2025 20:15 14s
Add series management pages Merge conflict check #3054: Pull request #1313 opened by owi92
January 15, 2025 10:38 11s
January 15, 2025 10:38 11s
Remove frame control button plugin (#1310) Merge conflict check #3053: Commit 8a673fc pushed by LukasKalbertodt
January 14, 2025 14:10 2m 9s next
next
January 14, 2025 14:10 2m 9s
Allow configuring logos for multiple languages (#1292) Merge conflict check #3052: Commit 3b99648 pushed by LukasKalbertodt
January 14, 2025 12:57 2m 10s next
next
January 14, 2025 12:57 2m 10s
Add "My series" page Merge conflict check #3051: Pull request #1311 synchronize by owi92
January 13, 2025 13:32 13s
January 13, 2025 13:32 13s
Add "My series" page Merge conflict check #3050: Pull request #1311 synchronize by owi92
January 13, 2025 10:31 12s
January 13, 2025 10:31 12s
Add "My series" page Merge conflict check #3049: Pull request #1311 synchronize by owi92
January 13, 2025 09:54 14s
January 13, 2025 09:54 14s
Add "My series" page Merge conflict check #3048: Pull request #1311 synchronize by owi92
January 10, 2025 14:58 11s
January 10, 2025 14:58 11s
Add "My series" page Merge conflict check #3047: Pull request #1311 opened by owi92
January 9, 2025 13:55 13s
January 9, 2025 13:55 13s
Remove frame control button plugin Merge conflict check #3046: Pull request #1310 opened by owi92
January 6, 2025 10:09 12s
January 6, 2025 10:09 12s