diff --git a/.github/history.json b/.github/history.json
index 8b595a7918dde9227b85e00015701142f00abb7f..4397bb729690b04aa208ae03f305e713c86c3b36 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -100904,6 +100904,164 @@
]
}
]
+ },
+ "6.0.0-rc.2": {
+ "node_version": "14.21.2",
+ "npm_version": "6.14.17",
+ "apps_engine_version": "1.37.0-alpha.157",
+ "mongo_versions": [
+ "4.4",
+ "5.0",
+ "6.0"
+ ],
+ "pull_requests": [
+ {
+ "pr": "28050",
+ "title": "Regression: Fix improper usage of useEndpointData",
+ "userLogin": "KevLehman",
+ "milestone": "6.0.0",
+ "contributors": [
+ "KevLehman",
+ "rodrigok",
+ "web-flow",
+ "murtaza98",
+ "MartinSchoeler"
+ ]
+ },
+ {
+ "pr": "28120",
+ "title": "Regression: View mode preferences without the selected option by default",
+ "userLogin": "hugocostadev",
+ "description": "After removing all Meteor Blaze templates from the project, the View mode preferences started presenting the issue:\r\n\r\nNo option is selected by default when the view mode preferences are open.\r\n\r\nPossible reason: React does allow you to use name attributes in the input tag, but it may cause some issues with radio buttons. One possible reason is that React uses a synthetic event system that does not rely on native HTML attributes, since we had the wrapper and several blaze templates in the project, this could be effecting this behavior ignoring the name attribute in the inputs.\r\n\r\n\r\n**Previous:**\r\n\r\n\r\n\r\n**Current:**\r\n",
+ "milestone": "6.0.0",
+ "contributors": [
+ "hugocostadev",
+ "sampaiodiego",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "28129",
+ "title": "Chore: Fix fetching Apps-Engine and MongoDB versions for release notes",
+ "userLogin": "sampaiodiego",
+ "contributors": [
+ "sampaiodiego",
+ "ggazzo",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "28142",
+ "title": "Regression: Slash commands detected at any line",
+ "userLogin": "tassoevan",
+ "milestone": "6.0.0",
+ "contributors": [
+ "tassoevan"
+ ]
+ },
+ {
+ "pr": "28111",
+ "title": "Regression: App requests notify admin function generating wrong link",
+ "userLogin": "rique223",
+ "description": "Fixed a development oversight in which the link of the app request Rocket.Cat message was generated without the marketplace version of the app nor the requests tab param.\r\nDemo gif (before):\r\n\r\n\r\nDemo gif (after):\r\n",
+ "contributors": [
+ "rique223",
+ "web-flow",
+ "sampaiodiego"
+ ]
+ },
+ {
+ "pr": "28128",
+ "title": "Chore: Improve time of meteor build",
+ "userLogin": "rodrigok",
+ "contributors": [
+ "rodrigok",
+ "web-flow",
+ "ggazzo"
+ ]
+ },
+ {
+ "pr": "28079",
+ "title": "Chore: Update tokens",
+ "userLogin": "juliajforesti",
+ "contributors": [
+ "juliajforesti",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "28125",
+ "title": "Regression: Fix sidebar horizontal scrolling",
+ "userLogin": "ggazzo",
+ "milestone": "6.0.0",
+ "contributors": [
+ "ggazzo",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "28058",
+ "title": "Chore: Presence cap tweaks",
+ "userLogin": "juliajforesti",
+ "contributors": [
+ "juliajforesti",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "27993",
+ "title": "Regression: Fix Custom CSS ",
+ "userLogin": "juliajforesti",
+ "contributors": [
+ "juliajforesti",
+ "ggazzo",
+ "web-flow",
+ "dougfabris"
+ ]
+ },
+ {
+ "pr": "28138",
+ "title": "Chore: Fix CI Docker Alpine build missing",
+ "userLogin": "rodrigok",
+ "contributors": [
+ "rodrigok"
+ ]
+ },
+ {
+ "pr": "28134",
+ "title": "Chore: Fix CI docker publish",
+ "userLogin": "rodrigok",
+ "contributors": [
+ "rodrigok"
+ ]
+ },
+ {
+ "pr": "28108",
+ "title": "Chore: Refactor CI to improve code reusability and organization",
+ "userLogin": "rodrigok",
+ "contributors": [
+ "rodrigok",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "28127",
+ "title": "Regression: Fix slash command with preview",
+ "userLogin": "ggazzo",
+ "contributors": [
+ "ggazzo"
+ ]
+ },
+ {
+ "pr": "28126",
+ "title": "Chore: Purge styles of the legacy `message` template",
+ "userLogin": "tassoevan",
+ "milestone": "6.0.0",
+ "contributors": [
+ "tassoevan"
+ ]
+ }
+ ]
}
},
"5.4.0-rc.0": {
diff --git a/HISTORY.md b/HISTORY.md
index 947371dd1e4d481702f7260f46f756c9763692ff..435d0bac773f8b777e9d065f062e7d2d5a649f5b 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,80 @@
# 6.0.0 (Under Release Candidate Process)
+## 6.0.0-rc.2
+`2023-02-23 · 15 🔠· 11 👩â€ðŸ’»ðŸ‘¨â€ðŸ’»`
+
+<details>
+<summary>🔠Minor changes</summary>
+
+
+- Chore: Fix CI Docker Alpine build missing ([#28138](https://github.com/RocketChat/Rocket.Chat/pull/28138))
+
+- Chore: Fix CI docker publish ([#28134](https://github.com/RocketChat/Rocket.Chat/pull/28134))
+
+- Chore: Fix fetching Apps-Engine and MongoDB versions for release notes ([#28129](https://github.com/RocketChat/Rocket.Chat/pull/28129))
+
+- Chore: Improve time of meteor build ([#28128](https://github.com/RocketChat/Rocket.Chat/pull/28128))
+
+- Chore: Presence cap tweaks ([#28058](https://github.com/RocketChat/Rocket.Chat/pull/28058))
+
+- Chore: Purge styles of the legacy `message` template ([#28126](https://github.com/RocketChat/Rocket.Chat/pull/28126))
+
+- Chore: Refactor CI to improve code reusability and organization ([#28108](https://github.com/RocketChat/Rocket.Chat/pull/28108))
+
+- Chore: Update tokens ([#28079](https://github.com/RocketChat/Rocket.Chat/pull/28079))
+
+- Regression: Fix sidebar horizontal scrolling ([#28125](https://github.com/RocketChat/Rocket.Chat/pull/28125))
+
+- Regression: App requests notify admin function generating wrong link ([#28111](https://github.com/RocketChat/Rocket.Chat/pull/28111))
+
+ Fixed a development oversight in which the link of the app request Rocket.Cat message was generated without the marketplace version of the app nor the requests tab param.
+ Demo gif (before):
+ 
+
+ Demo gif (after):
+ 
+
+- Regression: Fix Custom CSS ([#27993](https://github.com/RocketChat/Rocket.Chat/pull/27993))
+
+- Regression: Fix improper usage of useEndpointData ([#28050](https://github.com/RocketChat/Rocket.Chat/pull/28050))
+
+- Regression: Fix slash command with preview ([#28127](https://github.com/RocketChat/Rocket.Chat/pull/28127))
+
+- Regression: Slash commands detected at any line ([#28142](https://github.com/RocketChat/Rocket.Chat/pull/28142))
+
+- Regression: View mode preferences without the selected option by default ([#28120](https://github.com/RocketChat/Rocket.Chat/pull/28120))
+
+ After removing all Meteor Blaze templates from the project, the View mode preferences started presenting the issue:
+
+ No option is selected by default when the view mode preferences are open.
+
+ Possible reason: React does allow you to use name attributes in the input tag, but it may cause some issues with radio buttons. One possible reason is that React uses a synthetic event system that does not rely on native HTML attributes, since we had the wrapper and several blaze templates in the project, this could be effecting this behavior ignoring the name attribute in the inputs.
+
+
+ **Previous:**
+ 
+
+
+ **Current:**
+ 
+
+</details>
+
+### 👩â€ðŸ’»ðŸ‘¨â€ðŸ’» Core Team 🤓
+
+- [@KevLehman](https://github.com/KevLehman)
+- [@MartinSchoeler](https://github.com/MartinSchoeler)
+- [@dougfabris](https://github.com/dougfabris)
+- [@ggazzo](https://github.com/ggazzo)
+- [@hugocostadev](https://github.com/hugocostadev)
+- [@juliajforesti](https://github.com/juliajforesti)
+- [@murtaza98](https://github.com/murtaza98)
+- [@rique223](https://github.com/rique223)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+
## 6.0.0-rc.1
`2023-02-22 · 1 🛠· 10 🔠· 11 👩â€ðŸ’»ðŸ‘¨â€ðŸ’»`
diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel
index 6fb1ddb9f2b437dca28ca34db1916018e9a6595d..11b69237eaa82ac89fa59ada5b9beb371563ae1c 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.0.0-rc.1
+ENV RC_VERSION 6.0.0-rc.2
MAINTAINER buildmaster@rocket.chat
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index 97574623ffb6ea47cb12f55021f578deb4d1723e..55b4715bb9f9a7ad653e37176294a62f5fa572c9 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
{
- "version": "6.0.0-rc.1"
+ "version": "6.0.0-rc.2"
}
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index e7b5d37f3d16166254397a2e470ef8dd332bcfcc..9d86a8efe7e30753f0950432eb1be7cc4a2357d7 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.0.0-rc.1",
+ "version": "6.0.0-rc.2",
"private": true,
"author": {
"name": "Rocket.Chat",
diff --git a/package.json b/package.json
index ad3e4c675f0dfd897b88b5418351ec1a9b7d48ea..d682b2be0122b28934bcfae4700e0e22b8d8bbb3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "rocket.chat",
- "version": "6.0.0-rc.1",
+ "version": "6.0.0-rc.2",
"description": "Rocket.Chat Monorepo",
"main": "index.js",
"private": true,