mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge pull request #2156 from thornbill/no-merge-conflicts-on-forks

Browse source 
Prevent merge conflicts action from running on forks
This commit is contained in:
Joshua M. Boniface 2020-12-04 13:48:01 -05:00 • committed by GitHub
commit 0a15eba329
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/merge-conflicts.yml vendored
View file

@ -7,6 +7,7 @@ on:
jobs: jobs:
triage: triage:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.repository == 'jellyfin/jellyfin-web'
steps: steps:
- uses: mschilde/auto-label-merge-conflicts@master - uses: mschilde/auto-label-merge-conflicts@master
with: with: