Merge branch 'develop' into chore/make-aggs-run-on-secondary

.github/ISSUE_TEMPLATE/release.md

@@ -7,14 +7,14 @@ about: Internal release checklist template
 # Release {version}
 We are releasing a new version, this issue will keep track of the progress between the first release candidate (20th of each month) to the final release (27th of each month).
 
-Beginning on the 20th of each month, we will start the release process which ends 7 days later (the 27th). During this period of time, we will enter a "Feature Freeze". This Feature Freeze means that we will only be merging pull requests which fix bugs and not ones which add new features.
+Beginning on the 20th of each month, we will start the release process which ends 7 days later (the 27th). During this period of time, we will enter a "Feature Freeze". This Feature Freeze means that we will only be merging pull requests which fix bugs and not ones that add new features.
 
 When you find a bug that is a regression, please open a new issue and link it to this one.
 
 
 ## Before Release - Preparation - 1 business day before the day 20th
 - [x] Create the issue to track the release progress
-- [ ] Define the highlights from release PRs as suggestion to be included on Blog Post <!-- link to the website's issue -->
+- [ ] Define the highlights from release PRs as a suggestion to be included on Blog Post <!-- link to the website's issue -->
 - [ ] Talk to the Marketing Team about starting the release Blog Post
 - [ ] Talk to the Documentation Team about ensuring the Docs are up to date and all pull requests are merged
 - [ ] Sync translations from [LingoHub](https://translate.lingohub.com/rocketchat/rocket-dot-chat/dashboard)
@@ -41,19 +41,19 @@ When you find a bug that is a regression, please open a new issue and link it to
 - [ ] Check if the release was created as **draft** and contains the history
 - [ ] Check if the release Pull Request was created and contains the history
 - [ ] Ensure the **Pull Request** build is passing on [CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat)
-- [ ] When build is passing ask for Pull Request approval
+- [ ] When the build is passing ask for Pull Request approval
 - [ ] When approved, merge it!
 - [ ] Ensure the **Tag** build is passing on [CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat)
 - [ ] Ensure the image was sent to [Docker Hub](https://hub.docker.com/r/rocketchat/rocket.chat/tags/)
 - [ ] After all edit the release/tag and publish it
 
 ## After Release - Conclusion - 1 business day after the 27th
 - [ ] Ensure all of the related issues were closed
-- [ ] Determine if all of the related issues were correctly assigned to the this version's milestone
-- [ ] Get an update from Marketing Team about the release Blog Post
+- [ ] Determine if all of the related issues were correctly assigned to this version's milestone
+- [ ] Get an update from Marketing Team about the release of Blog Post
 - [ ] Check with the Documentation Team about the Docs release
 - [ ] Sync develop
   - [ ] Execute action `Develop Sync` via [Houston CLI](https://github.com/RocketChat/Rocket.Chat.Houston) (`houston release`)
   - [ ] Ensure the **Pull Request** build is passing on [CircleCI](https://circleci.com/gh/RocketChat/Rocket.Chat)
-  - [ ] When build has passed, ask for approval and wait
+  - [ ] When the build has passed, ask for approval and wait
   - [ ] Merge Sync PR

.github/history-manual.json

@@ -203,5 +203,12 @@
 		"contributors": [
 			"ggazzo"
 		]
+	}],
+	"5.3.3": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "ggazzo",
+		"contributors": [
+			"ggazzo"
+		]
 	}]
 }

.github/workflows/build_and_test.yml

@@ -485,7 +485,9 @@ jobs:
           RC_DOCKER_TAG: '${{ needs.release-versions.outputs.gh-docker-tag }}.official'
           DOCKER_TAG: ${{ needs.release-versions.outputs.gh-docker-tag }}
           TRANSPORTER: nats://nats:4222
-          ENTERPRISE_LICENSE: ${{ secrets.ENTERPRISE_LICENSE }}
+          # this is 100% intentional, secrets are not available at forks, so ee-tests will always fail
+          # to avoid this, we are using a dummy license, expiring on 2022-12-31
+          ENTERPRISE_LICENSE: GWHMQe3C3lu3if4ropk1iQ09sCKjIaQogwMymgl7pbuotLpHPhTzxvuSqJYmEtHGKX4MQsrYA+8witFF3JMOc3AswwAkxQz+TZz9+XfiBo49p7OL0xfO6f9ElhLHclptcEPFDSilQlmDI1Jjr7k+MdqXxE4XbZ4Pdeg9vdEDtroKvSvd0ngtFMkIXa6829Cg0nzTCCcWo3Jc80JPub6VMgpdZ2KnsswQt8dBz+psvztcwrqF7X5731HkPX0lTttjF6SSIs+WAIdwAY4b2VRtD3PbMWxbe0ac+2x5+ItIRH0PFRh/gVWdtiKfskQpcucU739CX/d4pQGK/OWxKifH1XH824doeyYuvjXwvCW5anPlRXKAqIn2gh6LcdGfFNIbjX9wG4/U162vDr3AtEpRYdjzfvvBW1gveYMGidIiEhQZu7h5Ie9b3tNBkNBgBcqibL9JO6K3/2pxX7gymjT+9VRZgB5+ME2pziD54SjSWCwkLcf/RByxArdDSqI3llKjyDnRXjhqzsLhmsc6UdJCJd1IiqjQ4v5QXH2C57cJlej93ZLuNRFcnb0cE0nAFHIfLSZP5CSJA/gY7mtBL0b0osUisNL/os7a74JFMoa4DDfTD2CarYV5E4+fpX3NqINzpYwFzZi9pH2wIL6oe1yuZPcn9vjRhK2jvG81tHSR/4s=
         run: |
           docker compose -f docker-compose-ci.yml up -d --build
 

.gitignore

@@ -43,3 +43,5 @@ yarn-error.log*
 
 .nvmrc
 .idea/
+.exrc
+.envrc