diff options
| author | morpheus65535 <[email protected]> | 2022-03-08 23:04:19 -0500 |
|---|---|---|
| committer | morpheus65535 <[email protected]> | 2022-03-08 23:04:19 -0500 |
| commit | 332a426b0d2b513759d67a35ea60494f29c5a346 (patch) | |
| tree | 6ec9065ecc16560b6ccf5ee47576ee88559f6d2e | |
| parent | 0166d9a0dddbbd3c862c25a3c75c62b2ef48db35 (diff) | |
| parent | 18b8947e00014570782a6ce424acbc4589b9a70a (diff) | |
| download | bazarr-332a426b0d2b513759d67a35ea60494f29c5a346.tar.gz bazarr-332a426b0d2b513759d67a35ea60494f29c5a346.zip | |
Merge remote-tracking branch 'origin/development' into developmentv1.0.4-beta.4
| -rw-r--r-- | .github/workflows/ci.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/release_beta_to_dev.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/release_dev_to_master.yaml | 4 | ||||
| -rw-r--r-- | .github/workflows/test_bazarr_execution.yml | 2 | ||||
| -rw-r--r-- | frontend/package-lock.json | 12 |
5 files changed, 12 insertions, 12 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 58b2e5a42..b9f019074 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 1 @@ -62,7 +62,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 1 diff --git a/.github/workflows/release_beta_to_dev.yaml b/.github/workflows/release_beta_to_dev.yaml index 6f7e85098..8586106d7 100644 --- a/.github/workflows/release_beta_to_dev.yaml +++ b/.github/workflows/release_beta_to_dev.yaml @@ -18,7 +18,7 @@ jobs: exit 1 - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: ${{ env.FETCH_DEPTH }} ref: development diff --git a/.github/workflows/release_dev_to_master.yaml b/.github/workflows/release_dev_to_master.yaml index 5e241a66a..2d998f3c0 100644 --- a/.github/workflows/release_dev_to_master.yaml +++ b/.github/workflows/release_dev_to_master.yaml @@ -22,7 +22,7 @@ jobs: exit 1 - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 ref: development @@ -62,7 +62,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Merge development -> master uses: devmasx/[email protected] diff --git a/.github/workflows/test_bazarr_execution.yml b/.github/workflows/test_bazarr_execution.yml index a56887a82..9ee2cec7b 100644 --- a/.github/workflows/test_bazarr_execution.yml +++ b/.github/workflows/test_bazarr_execution.yml @@ -16,7 +16,7 @@ jobs: exit 1 - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: ${{ env.FETCH_DEPTH }} ref: development diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 03557aa7c..0d0da911b 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -3609,9 +3609,9 @@ "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==" }, "node_modules/@types/react": { - "version": "17.0.38", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.38.tgz", - "integrity": "sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ==", + "version": "17.0.39", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.39.tgz", + "integrity": "sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -25021,9 +25021,9 @@ "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==" }, "@types/react": { - "version": "17.0.38", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.38.tgz", - "integrity": "sha512-SI92X1IA+FMnP3qM5m4QReluXzhcmovhZnLNm3pyeQlooi02qI7sLiepEYqT678uNiyc25XfCqxREFpy3W7YhQ==", + "version": "17.0.39", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.39.tgz", + "integrity": "sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug==", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", |