Merge pull request #27392 from RocketChat/release-5.3.4

RocketChat · Nov 29, 2022 · 161f960 · 161f960
2 parents 358b0e2 + e146797
commit 161f960
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 5 deletions.
diff --git a/.github/history.json b/.github/history.json
@@ -95655,6 +95655,85 @@
           ]
         }
       ]
+    },
+    "4.8.7": {
+      "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.8": {
+      "node_version": "14.19.3",
+      "npm_version": "6.14.17",
+      "mongo_versions": [
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": []
+    },
+    "5.1.5": {
+      "node_version": "14.19.3",
+      "npm_version": "6.14.17",
+      "mongo_versions": [
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": []
+    },
+    "5.2.1": {
+      "node_version": "14.19.3",
+      "npm_version": "6.14.17",
+      "mongo_versions": [
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": []
+    },
+    "5.3.3": {
+      "node_version": "14.19.3",
+      "npm_version": "6.14.17",
+      "mongo_versions": [
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": []
+    },
+    "5.3.4": {
+      "node_version": "14.19.3",
+      "npm_version": "6.14.17",
+      "mongo_versions": [
+        "4.2",
+        "4.4",
+        "5.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "27391",
+          "title": "[FIX] Thread messages being included in the room history even though they are not displayed",
+          "userLogin": "dougfabris",
+          "contributors": [
+            "dougfabris"
+          ]
+        },
+        {
+          "pr": "27340",
+          "title": "Release 5.3.3",
+          "userLogin": "ggazzo",
+          "contributors": [
+            "ggazzo"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,7 +1,38 @@
 
+# 5.3.4
+`2022-11-28  ·  1 🐛  ·  1 🔍  ·  2 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `14.19.3`
+- NPM: `6.14.17`
+- MongoDB: `4.2, 4.4, 5.0`
+
+### 🐛 Bug fixes
+
+
+- Thread messages being included in the room history even though they are not displayed ([#27391](https://github.com/RocketChat/Rocket.Chat/pull/27391))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Release 5.3.3 ([#27340](https://github.com/RocketChat/Rocket.Chat/pull/27340))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@dougfabris](https://github.com/dougfabris)
+- [@ggazzo](https://github.com/ggazzo)
+
 # 5.3.3
 `2022-11-24  ·  1 🐛  ·  1 👩‍💻👨‍💻`
 
+### Engine versions
+- Node: `14.19.3`
+- NPM: `6.14.17`
+- MongoDB: `4.2, 4.4, 5.0`
+
 ### 🐛 Bug fixes
 
 

diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 5.3.3
+ENV RC_VERSION 5.3.4
 
 MAINTAINER buildmaster@rocket.chat
 

diff --git a/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts b/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts
@@ -169,7 +169,7 @@ class RoomHistoryManagerClass extends Emitter {
 			({ ls } = subscription);
 		}
 
-		const result = await callWithErrorHandling('loadHistory', rid, ts, limit, ls);
+		const result = await callWithErrorHandling('loadHistory', rid, ts, limit, ls, false);
 
 		this.unqueue();
 

diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "5.3.3"
+	"version": "5.3.4"
 }
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/meteor",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "5.3.3",
+	"version": "5.3.4",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "5.3.3",
+	"version": "5.3.4",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,