Skip to content

Commit 6c98e91

Browse files
authored
Merge branch 'master' into forgotPassword
2 parents dcb5e31 + 429b959 commit 6c98e91

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/docker-publish.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ name: docker
22

33
on:
44
schedule:
5-
- cron: '19 17 * * *' # Nightly builds capture upstream updates to dependency images such as node.
5+
# Nightly builds capture upstream updates to dependency images such as node.
6+
- cron: '19 17 * * *'
67
push:
7-
branches: [ master, 'release-*.*.*' ]
8+
branches: [ master ]
89
tags: [ '*.*.*' ]
910

1011
env:
@@ -22,7 +23,7 @@ jobs:
2223
steps:
2324
- name: Determine branch name
2425
id: branch
25-
run: echo ::set-output name=branch_name::${GITHUB_REF#refs/*/}
26+
run: echo "::set-output name=branch_name::${GITHUB_REF#refs/*/}"
2627

2728
- name: Checkout repository
2829
uses: actions/checkout@v2
@@ -47,7 +48,7 @@ jobs:
4748
with:
4849
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
4950
flavor: |
50-
latest=${{ steps.branch.branch_name == 'master' }}
51+
latest=${{ steps.branch.outputs.branch_name == 'master' }}
5152
5253
- name: Build and push Docker image
5354
uses: docker/build-push-action@v2

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ ___
152152
- ci: bump ci environment (Manuel Trezza) [#7539](https://github.com/parse-community/parse-server/pull/7539)
153153
- Added Parse Server Option `passwordPolicy.resetPasswordSuccessOnInvalidEmail` (Daniel Blyth) [#7551](https://github.com/parse-community/parse-server/pull/7551)
154154
- CI now pushes docker images to Docker Hub (Corey Baker) [#7548](https://github.com/parse-community/parse-server/pull/7548)
155+
- docs: Introduce deprecation ID for reference in comments and online search (Manuel Trezza) [#7562](https://github.com/parse-community/parse-server/pull/7562)
155156

156157
## 4.10.3
157158
[Full Changelog](https://github.com/parse-community/parse-server/compare/4.10.2...4.10.3)

DEPRECATIONS.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
The following is a list of deprecations, according to the [Deprecation Policy](https://github.com/parse-community/parse-server/blob/master/CONTRIBUTING.md#deprecation-policy). After a feature becomes deprecated, and giving developers time to adapt to the change, the deprecated feature will eventually be removed, leading to a breaking change. Developer feedback during the deprecation period may postpone or even revoke the introduction of the breaking change.
44

5-
| Change | Issue | Deprecation [ℹ️][i_deprecation] | Planned Removal [ℹ️][i_removal] | Status [ℹ️][i_status] | Notes |
6-
|-------------------------------------------------|----------------------------------------------------------------------|---------------------------------|---------------------------------|-----------------------|-------|
7-
| Native MongoDB syntax in aggregation pipeline | [#7338](https://github.com/parse-community/parse-server/issues/7338) | 5.0.0 (2022) | 6.0.0 (2023) | deprecated | - |
8-
| Config option `directAccess` defaults to `true` | [#6636](https://github.com/parse-community/parse-server/pull/6636) | 5.0.0 (2022) | 6.0.0 (2023) | deprecated | - |
5+
| ID | Change | Issue | Deprecation [ℹ️][i_deprecation] | Planned Removal [ℹ️][i_removal] | Status [ℹ️][i_status] | Notes |
6+
|--------|-------------------------------------------------|----------------------------------------------------------------------|---------------------------------|---------------------------------|-----------------------|-------|
7+
| DEPPS1 | Native MongoDB syntax in aggregation pipeline | [#7338](https://github.com/parse-community/parse-server/issues/7338) | 5.0.0 (2022) | 6.0.0 (2023) | deprecated | - |
8+
| DEPPS2 | Config option `directAccess` defaults to `true` | [#6636](https://github.com/parse-community/parse-server/pull/6636) | 5.0.0 (2022) | 6.0.0 (2023) | deprecated | - |
99

1010
[i_deprecation]: ## "The version and date of the deprecation."
1111
[i_removal]: ## "The version and date of the planned removal."

0 commit comments

Comments
 (0)