Skip to content

Commit 04b204e

Browse files
authored
Merge branch 'alpha' into file-types
2 parents af1fe53 + e76123b commit 04b204e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+2186
-1179
lines changed

.dockerignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
node_modules
22
npm-debug.log
33
*.md
4-
PATENTS
5-
LICENSE
64
Dockerfile
75
.dockerignore
86
.gitignore

.flowconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88

99
[options]
1010
suppress_comment= \\(.\\|\n\\)*\\@flow-disable-next
11+
esproposal.optional_chaining=enable

.github/pull_request_template.md

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
1-
### New Pull Request Checklist
2-
<!--
3-
Please check the following boxes [x] before submitting your issue.
4-
Click the "Preview" tab for better readability.
5-
Thanks for contributing to Parse Server!
6-
-->
1+
## Pull Request
72

8-
- [ ] I am not disclosing a [vulnerability](https://github.com/parse-community/parse-server/blob/master/SECURITY.md).
9-
- [ ] I am creating this PR in reference to an [issue](https://github.com/parse-community/parse-server/issues?q=is%3Aissue).
3+
- Report security issues [confidentially](https://github.com/parse-community/parse-server/security/policy).
4+
- Any contribution is under this [license](https://github.com/parse-community/parse-server/blob/alpha/LICENSE).
5+
- Link this pull request to an [issue](https://github.com/parse-community/parse-server/issues?q=is%3Aissue).
106

11-
### Issue Description
12-
<!-- Add a brief description of the issue this PR solves. -->
7+
## Issue
8+
<!-- Add the link to the issue that this PR closes. -->
139

1410
Closes: FILL_THIS_OUT
1511

16-
### Approach
17-
<!-- Add a description of the approach in this PR. -->
12+
## Approach
13+
<!-- Describe the changes in this PR. -->
1814

19-
### TODOs before merging
20-
<!--
21-
Add TODOs that need to be completed before merging this PR.
22-
Delete suggested TODOs that do not apply to this PR.
23-
-->
15+
## Tasks
16+
<!-- Delete tasks that don't apply. -->
2417

2518
- [ ] Add tests
26-
- [ ] Add changes to documentation (guides, repository pages, in-code descriptions)
19+
- [ ] Add changes to documentation (guides, repository pages, code comments)
2720
- [ ] Add [security check](https://github.com/parse-community/parse-server/blob/master/CONTRIBUTING.md#security-checks)
2821
- [ ] Add new Parse Error codes to Parse JS SDK <!-- no hard-coded error codes in Parse Server -->

.github/workflows/ci.yml

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
name: ci
22
on:
33
push:
4-
branches: [ release, alpha, beta ]
4+
branches: [ release*, alpha, beta ]
55
pull_request:
6-
branches: [ release, alpha, beta ]
6+
branches:
7+
- '**'
78
env:
8-
NODE_VERSION: 18.12.1
9+
NODE_VERSION: 19.3.0
910
PARSE_SERVER_TEST_TIMEOUT: 20000
1011
jobs:
1112
check-code-analysis:
@@ -145,24 +146,24 @@ jobs:
145146
- name: MongoDB 4.2, ReplicaSet
146147
MONGODB_VERSION: 4.2.19
147148
MONGODB_TOPOLOGY: replicaset
148-
NODE_VERSION: 18.12.1
149+
NODE_VERSION: 19.3.0
149150
- name: MongoDB 4.4, ReplicaSet
150151
MONGODB_VERSION: 4.4.13
151152
MONGODB_TOPOLOGY: replicaset
152-
NODE_VERSION: 18.12.1
153+
NODE_VERSION: 19.3.0
153154
- name: MongoDB 5, ReplicaSet
154155
MONGODB_VERSION: 5.3.2
155156
MONGODB_TOPOLOGY: replicaset
156-
NODE_VERSION: 18.12.1
157+
NODE_VERSION: 19.3.0
157158
- name: MongoDB 6, ReplicaSet
158159
MONGODB_VERSION: 6.0.2
159160
MONGODB_TOPOLOGY: replicaset
160-
NODE_VERSION: 18.12.1
161+
NODE_VERSION: 19.3.0
161162
- name: Redis Cache
162163
PARSE_SERVER_TEST_CACHE: redis
163164
MONGODB_VERSION: 4.4.13
164165
MONGODB_TOPOLOGY: standalone
165-
NODE_VERSION: 18.12.1
166+
NODE_VERSION: 19.3.0
166167
- name: Node 14
167168
MONGODB_VERSION: 4.4.13
168169
MONGODB_TOPOLOGY: standalone
@@ -171,6 +172,10 @@ jobs:
171172
MONGODB_VERSION: 4.4.13
172173
MONGODB_TOPOLOGY: standalone
173174
NODE_VERSION: 16.18.1
175+
- name: Node 18
176+
MONGODB_VERSION: 4.4.13
177+
MONGODB_TOPOLOGY: standalone
178+
NODE_VERSION: 18.12.1
174179
fail-fast: false
175180
name: ${{ matrix.name }}
176181
timeout-minutes: 15
@@ -189,6 +194,9 @@ jobs:
189194
steps:
190195
- name: Fix usage of insecure GitHub protocol
191196
run: sudo git config --system url."https://github".insteadOf "git://github"
197+
- name: Fix git protocol for Node 14
198+
if: ${{ startsWith(matrix.NODE_VERSION, '14.') }}
199+
run: sudo git config --system url."https://github".insteadOf "ssh://git@github"
192200
- uses: actions/checkout@v2
193201
- name: Use Node.js ${{ matrix.NODE_VERSION }}
194202
uses: actions/setup-node@v2
@@ -214,28 +222,28 @@ jobs:
214222
include:
215223
- name: PostgreSQL 11, PostGIS 3.0
216224
POSTGRES_IMAGE: postgis/postgis:11-3.0
217-
NODE_VERSION: 18.12.1
225+
NODE_VERSION: 19.3.0
218226
- name: PostgreSQL 11, PostGIS 3.1
219227
POSTGRES_IMAGE: postgis/postgis:11-3.1
220-
NODE_VERSION: 18.12.1
228+
NODE_VERSION: 19.3.0
221229
- name: PostgreSQL 11, PostGIS 3.2
222230
POSTGRES_IMAGE: postgis/postgis:11-3.2
223-
NODE_VERSION: 18.12.1
231+
NODE_VERSION: 19.3.0
224232
- name: PostgreSQL 11, PostGIS 3.3
225233
POSTGRES_IMAGE: postgis/postgis:11-3.3
226-
NODE_VERSION: 18.12.1
234+
NODE_VERSION: 19.3.0
227235
- name: PostgreSQL 12, PostGIS 3.3
228236
POSTGRES_IMAGE: postgis/postgis:12-3.3
229-
NODE_VERSION: 18.12.1
237+
NODE_VERSION: 19.3.0
230238
- name: PostgreSQL 13, PostGIS 3.3
231239
POSTGRES_IMAGE: postgis/postgis:13-3.3
232-
NODE_VERSION: 18.12.1
240+
NODE_VERSION: 19.3.0
233241
- name: PostgreSQL 14, PostGIS 3.3
234242
POSTGRES_IMAGE: postgis/postgis:14-3.3
235-
NODE_VERSION: 18.12.1
243+
NODE_VERSION: 19.3.0
236244
- name: PostgreSQL 15, PostGIS 3.3
237245
POSTGRES_IMAGE: postgis/postgis:15-3.3
238-
NODE_VERSION: 18.12.1
246+
NODE_VERSION: 19.3.0
239247
fail-fast: false
240248
name: ${{ matrix.name }}
241249
timeout-minutes: 15

2.3.0.md

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)