Skip to content

Commit 57abc4e

Browse files
authored
Merge branch 'master' into fixSelectExclude
2 parents d65430f + 45d00ce commit 57abc4e

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,16 @@ jobs:
7979
- uses: actions/checkout@v2
8080
- name: Build docker image
8181
uses: docker/build-push-action@v2
82+
check-lock-file-version:
83+
name: NPM Lock File Version
84+
timeout-minutes: 5
85+
runs-on: ubuntu-18.04
86+
steps:
87+
- uses: actions/checkout@v2
88+
- name: Check NPM lock file version
89+
uses: mansona/npm-lockfile-version@v1
90+
with:
91+
version: 1
8292
check-mongo:
8393
strategy:
8494
matrix:

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,9 @@ ___
128128
- Added centralized feature deprecation with standardized warning logs (Manuel Trezza) [#7303](https://github.com/parse-community/parse-server/pull/7303)
129129
- Use Node.js 15.13.0 in CI (Olle Jonsson) [#7312](https://github.com/parse-community/parse-server/pull/7312)
130130
- Fix file upload issue for S3 compatible storage (Linode, DigitalOcean) by avoiding empty tags property when creating a file (Ali Oguzhan Yildiz) [#7300](https://github.com/parse-community/parse-server/pull/7300)
131-
- Fix select and excludeKey queries to properly accept JSON string arrays. Also allow nested fields in exclude. [#7242](https://github.com/parse-community/parse-server/pull/7242). Thanks to [Corey Baker](https://github.com/cbaker6).
132131
- Add building Docker image as CI check (Manuel Trezza) [#7332](https://github.com/parse-community/parse-server/pull/7332)
132+
- Add NPM package-lock version check to CI (Manuel Trezza) [#7333](https://github.com/parse-community/parse-server/pull/7333)
133+
- Fix select and excludeKey queries to properly accept JSON string arrays. Also allow nested fields in exclude (Corey Baker) [#7242](https://github.com/parse-community/parse-server/pull/7242)
133134

134135
___
135136
## 4.5.0

0 commit comments

Comments
 (0)