diff options
| author | Patrick Barron <barronpm@gmail.com> | 2021-06-22 21:09:54 -0400 |
|---|---|---|
| committer | Patrick Barron <barronpm@gmail.com> | 2021-06-23 20:22:12 -0400 |
| commit | ae878fa051e73dd1df90f1fed3ca5f7ad28b7beb (patch) | |
| tree | 8d590d6ae9aea9a84626fa31695f0ed47969e33d /.github | |
| parent | f96722fa749b94b8affbf75da5d6941cab219a84 (diff) | |
| parent | 94056049131a8573d7a4d0690da04c0e8bc240ad (diff) | |
Merge branch 'master' into authenticationdb-efcore
# Conflicts:
# Emby.Server.Implementations/QuickConnect/QuickConnectManager.cs
# Emby.Server.Implementations/Session/SessionManager.cs
# Jellyfin.Server.Implementations/Security/AuthorizationContext.cs
Diffstat (limited to '.github')
| -rw-r--r-- | .github/workflows/automation.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml index 8da2349c8..38415f1c6 100644 --- a/.github/workflows/automation.yml +++ b/.github/workflows/automation.yml @@ -11,6 +11,7 @@ jobs: label: name: Labeling runs-on: ubuntu-latest + if: ${{ github.repository == 'jellyfin/jellyfin' }} steps: - name: Apply label uses: eps1lon/actions-label-merge-conflict@v2.0.1 @@ -22,6 +23,7 @@ jobs: project: name: Project board runs-on: ubuntu-latest + if: ${{ github.repository == 'jellyfin/jellyfin' }} steps: - name: Remove from 'Current Release' project uses: alex-page/github-project-automation-plus@v0.7.1 |