Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add merge conflict labeler and gradle update and validate tasks #309

Merged
merged 3 commits into from
Feb 24, 2021

Conversation

nielsvanvelzen
Copy link
Member

Part of this comes from jellyfin/jellyfin-sdk-kotlin#163 with some slight improvements, the labeler comes from the ATV repo with some changes (added a schedule).

@nielsvanvelzen nielsvanvelzen added this to In progress in v2.3.0 via automation Feb 23, 2021
@nielsvanvelzen nielsvanvelzen marked this pull request as draft February 23, 2021 16:03
@nielsvanvelzen nielsvanvelzen marked this pull request as ready for review February 23, 2021 16:06
.github/workflows/gradlew-update.yaml Outdated Show resolved Hide resolved
@Maxr1998 Maxr1998 merged commit 4ee5048 into jellyfin:master Feb 24, 2021
v2.3.0 automation moved this from In progress to Done Feb 24, 2021
@Maxr1998
Copy link
Member

Yikes, should've merged. Clicked a bit too fast 🙈

@nielsvanvelzen nielsvanvelzen deleted the gh-actions-gradle-conflict branch February 25, 2021 07:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants