[NEW] Upstream catchup

.github/CONTRIBUTING.md

@@ -18,10 +18,10 @@ __Note:__ If there's a feature you'd like, there's a bug you'd like to fix, or y
 
 ## Development Guidelines
 
-Check out our Handbook for the [Development Guidelines](https://handbook.rocket.chat/product/development/development-guidelines) on how to setup your enviroment, do code, test and push your code. There you find our patterns on how to compose your Pull Requests' titles to have your contribution accepted.
+Check out our Handbook for the [Development Guidelines](https://handbook.rocket.chat/product/development/development-guidelines) on how to set up your environment, do code, test and push your code. There you find our patterns on how to compose your Pull Requests' titles to have your contribution accepted.
 
 ## Contributor License Agreement
 
-To have your contribution accepted you must sign our [Contributor License Agreement](https://cla-assistant.io/RocketChat/Rocket.Chat). In case you submit a Pull Request before sign the CLA GitHub will alert you with a new comment asking you to sign and will block the Pull Request from be merged by us.
+To have your contribution accepted you must sign our [Contributor License Agreement](https://cla-assistant.io/RocketChat/Rocket.Chat). In case you submit a Pull Request before signing the CLA GitHub will alert you with a new comment asking you to sign and will block the Pull Request from being merged by us.
 
 Please review and sign our CLA at https://cla-assistant.io/RocketChat/Rocket.Chat

.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 approved merge it!
+- [ ] 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/actions/setup-node/action.yml

@@ -0,0 +1,46 @@
+name: 'Setup Node'
+
+inputs:
+  node-version:
+    required: true
+    type: string
+  cache-modules:
+    required: false
+    type: boolean
+  install:
+    required: false
+    type: boolean
+
+outputs:
+  node-version:
+    value: ${{ steps.node-version.outputs.node-version }}
+
+runs:
+  using: composite
+
+  steps:
+    # - name: Cache Node Modules
+    #   if: inputs.cache-modules
+    #   id: cache-node-modules
+    #   uses: actions/cache@v3
+    #   with:
+    #     path: |
+    #       node_modules
+    #       **/node_modules
+    #     key: node-modules-${{ hashFiles('yarn.lock') }}
+    #
+    # Could use this command to list all paths to save:
+    # find . -name 'node_modules' -prune | grep -v "/\.meteor/" | grep -v "/meteor/packages/"
+
+    - name: Use Node.js ${{ inputs.node-version }}
+      id: node-version
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ inputs.node-version }}
+        cache: ${{ steps.cache-node-modules.outputs.cache-hit != 'true' && 'yarn' || '' }}
+
+    - name: yarn install
+      # if: inputs.install && steps.cache-node-modules.outputs.cache-hit != 'true'
+      if: inputs.install
+      shell: bash
+      run: yarn

.github/history-manual.json

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