Merge remote-tracking branch 'origin/reelase-5.1.2'

.github/history-manual.json

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

.github/history.json

@@ -93643,6 +93643,71 @@
           ]
         }
       ]
+    },
+    "4.8.5": {
+      "node_version": "14.18.3",
+      "npm_version": "6.14.15",
+      "mongo_versions": [
+        "3.6",
+        "4.0",
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": []
+    },
+    "5.0.6": {
+      "node_version": "14.19.3",
+      "npm_version": "6.14.17",
+      "mongo_versions": [
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": []
+    },
+    "5.1.2": {
+      "node_version": "14.19.3",
+      "npm_version": "6.14.17",
+      "mongo_versions": [
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "26776",
+          "title": "[FIX] Livechat trigger messages covering all the website",
+          "userLogin": "tiagoevanp",
+          "milestone": "5.1.1",
+          "contributors": [
+            "tiagoevanp",
+            "kodiakhq[bot]",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "26808",
+          "title": "[FIX] Restore current chats  default table order",
+          "userLogin": "MartinSchoeler",
+          "milestone": "5.1.1",
+          "contributors": [
+            "MartinSchoeler",
+            "kodiakhq[bot]",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "26819",
+          "title": "[FIX] Fix broken legacy message view",
+          "userLogin": "hugocostadev",
+          "description": "Fixed `messagesHistory` function, it was filtering messages only with existing threads.",
+          "milestone": "5.1.1",
+          "contributors": [
+            "hugocostadev"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file

apps/meteor/.docker/Dockerfile.rhel

 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 5.1.1
+ENV RC_VERSION 5.1.2
 
 MAINTAINER buildmaster@rocket.chat
 

apps/meteor/app/utils/rocketchat.info

 {
-	"version": "5.1.1"
+	"version": "5.1.2"
 }

apps/meteor/package.json

 {
 	"name": "@rocket.chat/meteor",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "5.1.1",
+	"version": "5.1.2",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
@@ -373,7 +373,7 @@
 		"use-subscription": "~1.6.0",
 		"use-sync-external-store": "^1.2.0",
 		"uuid": "^8.3.2",
-		"vm2": "^3.9.10",
+		"vm2": "^3.9.11",
 		"webdav": "^4.10.0",
 		"xml-crypto": "^2.1.4",
 		"xml-encryption": "2.0.0",

package.json

 {
 	"name": "rocket.chat",
-	"version": "5.1.1",
+	"version": "5.1.2",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,

yarn.lock

@@ -4125,7 +4125,7 @@ __metadata:
     use-subscription: ~1.6.0
     use-sync-external-store: ^1.2.0
     uuid: ^8.3.2
-    vm2: ^3.9.10
+    vm2: ^3.9.11
     webdav: ^4.10.0
     webpack: ^4.46.0
     xml-crypto: ^2.1.4
@@ -20301,7 +20301,7 @@ __metadata:
       optional: true
   bin:
     lessc: ./bin/lessc
-  checksum: c9b8c0e865427112c48a9cac36f14964e130577743c29d56a6d93b5812b70846b04ccaa364acf1e8d75cee3855215ec0a2d8d9de569c80e774f10b6245f39b7d
+  checksum: 61568b56b5289fdcfe3d51baf3c13e7db7140022c0a37ef0ae343169f0de927a4b4f4272bc10c20101796e8ee79e934e024051321bba93b3ae071f734309bd98
   languageName: node
   linkType: hard
@@ -31782,15 +31782,15 @@ __metadata:
   languageName: node
   linkType: hard
-"vm2@npm:^3.9.10":
-  version: 3.9.10
-  resolution: "vm2@npm:3.9.10"
+"vm2@npm:^3.9.11":
+  version: 3.9.11
+  resolution: "vm2@npm:3.9.11"
   dependencies:
     acorn: ^8.7.0
     acorn-walk: ^8.2.0
   bin:
     vm2: bin/vm2
-  checksum: 5534df3d3f3aa9060ab23fd22a2f5e756c19bec7b9af50028aa05c6f7c21c3da303101f1982004964d5320f9484d02a2d299e841994dce03af7fe1061871b518
+  checksum: aab39e6e4b59146d24abacd79f490e854a6e058a8b23d93d2be5aca7720778e2605d2cc028ccc4a5f50d3d91b0c38be9a6247a80d2da1a6de09425cc437770b4
   languageName: node
   linkType: hard