diff options
| author | morpheus65535 <[email protected]> | 2022-03-21 21:05:16 -0400 |
|---|---|---|
| committer | morpheus65535 <[email protected]> | 2022-03-21 21:05:16 -0400 |
| commit | d66dc73b2082622b9d6ba95d83573c9a70dd11c7 (patch) | |
| tree | cd4a2f03bf140e7de4e85a138c70f420f676b012 | |
| parent | a03708940dcfe5d858ebbf3959952540db8b061f (diff) | |
| parent | dbdccfc7b8e67372123f22e760f5303e311b5ea5 (diff) | |
| download | bazarr-d66dc73b2082622b9d6ba95d83573c9a70dd11c7.tar.gz bazarr-d66dc73b2082622b9d6ba95d83573c9a70dd11c7.zip | |
Merge remote-tracking branch 'origin/development' into development
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/release_beta_to_dev.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/release_dev_to_master.yaml | 2 | ||||
| -rw-r--r-- | frontend/package-lock.json | 12 |
4 files changed, 9 insertions, 9 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e8d90837..77326c659 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: fetch-depth: 1 - name: Cache node_modules - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: "${{ env.UI_DIRECTORY }}/node_modules" key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }} diff --git a/.github/workflows/release_beta_to_dev.yaml b/.github/workflows/release_beta_to_dev.yaml index d57fcc5bf..2a415f3da 100644 --- a/.github/workflows/release_beta_to_dev.yaml +++ b/.github/workflows/release_beta_to_dev.yaml @@ -29,7 +29,7 @@ jobs: git fetch --depth ${{ env.FETCH_DEPTH }} --tags - name: Cache node_modules - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: "${{ env.UI_DIRECTORY }}/node_modules" key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }} diff --git a/.github/workflows/release_dev_to_master.yaml b/.github/workflows/release_dev_to_master.yaml index 28f4ee1e9..298bdbebf 100644 --- a/.github/workflows/release_dev_to_master.yaml +++ b/.github/workflows/release_dev_to_master.yaml @@ -31,7 +31,7 @@ jobs: run: git config --global user.name "github-actions" - name: Cache node_modules - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: "${{ env.UI_DIRECTORY }}/node_modules" key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }} diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 5e4bd3e64..fdb63bb06 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -2353,9 +2353,9 @@ "integrity": "sha512-2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q==" }, "node_modules/@types/bootstrap": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.1.6.tgz", - "integrity": "sha512-3L6IvOCKyoVd3e4bgQTH7VBPbuYEOG8IQbRcuZ0AbjfwPdRX+kVf5L/7mVt1EVM+D/BVw4+71rtp7Z8yYROlpQ==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.1.9.tgz", + "integrity": "sha512-Tembe6lt7819EUzV5LSG9uuwULm4hdEGV9LZ8QBYpWc0J+a+9DdmJEwZ4FMaXGVJWwumTPSkJ8JQF0/KDAmXYg==", "dev": true, "dependencies": { "@popperjs/core": "^2.9.2", @@ -9087,9 +9087,9 @@ "integrity": "sha512-2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q==" }, "@types/bootstrap": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.1.6.tgz", - "integrity": "sha512-3L6IvOCKyoVd3e4bgQTH7VBPbuYEOG8IQbRcuZ0AbjfwPdRX+kVf5L/7mVt1EVM+D/BVw4+71rtp7Z8yYROlpQ==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-5.1.9.tgz", + "integrity": "sha512-Tembe6lt7819EUzV5LSG9uuwULm4hdEGV9LZ8QBYpWc0J+a+9DdmJEwZ4FMaXGVJWwumTPSkJ8JQF0/KDAmXYg==", "dev": true, "requires": { "@popperjs/core": "^2.9.2", |