From 81b601dc2ec35c7192ab55afc1da365d06ad58ae Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 24 Apr 2023 15:14:34 -0300
Subject: [PATCH 1/2] chore(deps): Update `vm2` (#29025)

---
 apps/meteor/package.json |  2 +-
 yarn.lock                | 14 +-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index b86f1b19872..b72e7650d78 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -395,7 +395,7 @@
 		"use-subscription": "~1.6.0",
 		"use-sync-external-store": "^1.2.0",
 		"uuid": "^8.3.2",
-		"vm2": "^3.9.16",
+		"vm2": "^3.9.17",
 		"webdav": "^4.11.0",
 		"xml-crypto": "^2.1.4",
 		"xml-encryption": "2.0.0",
diff --git a/yarn.lock b/yarn.lock
index 04c141f608f..12056e8893d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7545,7 +7545,7 @@ __metadata:
     use-subscription: ~1.6.0
     use-sync-external-store: ^1.2.0
     uuid: ^8.3.2
-    vm2: ^3.9.16
+    vm2: ^3.9.17
     webdav: ^4.11.0
     webpack: ^4.46.0
     xml-crypto: ^2.1.4
@@ -38403,18 +38403,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vm2@npm:^3.9.16":
-  version: 3.9.16
-  resolution: "vm2@npm:3.9.16"
-  dependencies:
-    acorn: ^8.7.0
-    acorn-walk: ^8.2.0
-  bin:
-    vm2: bin/vm2
-  checksum: 646b45dca721acb3c8e4ae0742129f13612972387911c2475f3c06ac2b4232000cab0bdaaa65d97d6ea8dc70880e039542618b1b3d04adea79cd94803cbc4ab3
-  languageName: node
-  linkType: hard
-
 "vm2@npm:^3.9.17":
   version: 3.9.17
   resolution: "vm2@npm:3.9.17"

From e4e85cde558750e874ca828b8eb8d1d4b6884d56 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 24 Apr 2023 15:55:13 -0300
Subject: [PATCH 2/2] Bump version to 6.1.5

---
 HISTORY.md                            | 21 +++++++++++++++++++++
 apps/meteor/.docker/Dockerfile.rhel   |  2 +-
 apps/meteor/app/utils/rocketchat.info |  2 +-
 apps/meteor/package.json              |  2 +-
 package.json                          |  2 +-
 5 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index 2c8a77335ec..0fe5b7ce1d7 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,25 @@
 
+`2023-04-24  ·  1 🔍  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `14.21.2`
+- NPM: `6.14.17`
+- MongoDB: `4.4, 5.0, 6.0`
+- Apps-Engine: `1.38.2`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Update `vm2` ([#29025](https://github.com/RocketChat/Rocket.Chat/pull/29025))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
+
 `2023-04-20  ·  1 🔍  ·  2 👩‍💻👨‍💻`
 
 ### Engine versions
diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel
index 8074d281f14..79c2e9afc83 100644
--- 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 6.1.4
+ENV RC_VERSION 6.1.5
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index fa073b35039..cc27fd07082 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "6.1.4"
+	"version": "6.1.5"
 }
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index b72e7650d78..11beb0514f9 100644
--- 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": "6.1.4",
+	"version": "6.1.5",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
diff --git a/package.json b/package.json
index 6dfb2f90cd8..a251dc8177f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "6.1.4",
+	"version": "6.1.5",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,