Pull "main" branch to develop for new branching strategy #6281
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Taylor Smock <[email protected]>
Signed-off-by: Taylor Smock <[email protected]>
Signed-off-by: Taylor Smock <[email protected]>
Signed-off-by: Taylor Smock <[email protected]>
Signed-off-by: Taylor Smock <[email protected]>
… for some of those functions Signed-off-by: Taylor Smock <[email protected]>
Signed-off-by: Taylor Smock <[email protected]>
Signed-off-by: Taylor Smock <[email protected]>
Signed-off-by: Taylor Smock <[email protected]>
Update Rapid to v2
- Increase API Backend load balancer timeout from 60s to 180s - Bump PostgreSQL engine version for AWS RDS from 11.19 to 13.10 - Cleanup unused Route53 entry (must be removed) - Enable HTTP/2 in API Backend load balancer explicitly (no infra change) - Add experimental dummy Route53 entries to new tasks.hotosm.org hosted zone. Both A and AAAA resource records are added
Increase API load balancer timeout
…/semver-5.7.2 Bump semver from 5.7.1 to 5.7.2 in /frontend
…/word-wrap-1.2.4 Bump word-wrap from 1.2.3 to 1.2.4 in /frontend
…/browserify-sign-4.2.2 Bump browserify-sign from 4.2.1 to 4.2.2 in /frontend
Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.0.1 to 4.3.2. - [Changelog](https://github.com/adobe/css-tools/blob/main/History.md) - [Commits](https://github.com/adobe/css-tools/commits) --- updated-dependencies: - dependency-name: "@adobe/css-tools" dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
- Related to #6241
|
Since there are many old PRs for the main branch, which nobody has used for quite a while, |
…tats Redesign `User Stats` page
…t-tag Fix `404 Network Error` in `Comments Section`
Causing to fail with requests.exceptions.HTTPError: 403 Client Error: Forbidden for url. Solved with appropriate User agent headers
This reverts commit 4c88f32.
This reverts commit 2f80692.
This reverts commit dea12f4.
This reverts commit bc1edb3.
This reverts commit 2111ce9.
This reverts commit 27661dd.
|
Agree with @robsavoye - we will create a new main branch out of existing develop. |
…ngDQ Revert "Live Monitoring View"
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@ramyaragupathy this is an example pull request that could be made to prepare a deployment.
First all PRs should be made to "develop" which will be deployed to the dev servers
Then when preparing for a deployment, a PR should be made like this one, develop onto main. Merging this will deploy to staging and the PR can serve as a useful commit history for the release notes.