diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index d37fe4e3041e..7a4e52e2c1bd 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/ubi8/nodejs-12
-ENV RC_VERSION 3.18.0-rc.4
+ENV RC_VERSION 3.18.0
MAINTAINER buildmaster@rocket.chat
diff --git a/.github/history.json b/.github/history.json
index 0835a7ff21fb..748d09baeb32 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -64538,6 +64538,18 @@
]
}
]
+ },
+ "3.18.0": {
+ "node_version": "12.22.1",
+ "npm_version": "6.14.1",
+ "apps_engine_version": "1.27.1",
+ "mongo_versions": [
+ "3.4",
+ "3.6",
+ "4.0",
+ "4.2"
+ ],
+ "pull_requests": []
}
}
}
\ No newline at end of file
diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat
index a28728dc2101..c8236e1197b7 100755
--- a/.snapcraft/resources/prepareRocketChat
+++ b/.snapcraft/resources/prepareRocketChat
@@ -1,6 +1,6 @@
#!/bin/bash
-curl -SLf "https://releases.rocket.chat/3.18.0-rc.4/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/3.18.0/download/" -o rocket.chat.tgz
tar xf rocket.chat.tgz --strip 1
diff --git a/.snapcraft/snap/snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml
index 0ac0cc5fae6b..aa6d2251b32d 100644
--- a/.snapcraft/snap/snapcraft.yaml
+++ b/.snapcraft/snap/snapcraft.yaml
@@ -7,7 +7,7 @@
# 5. `snapcraft snap`
name: rocketchat-server
-version: 3.18.0-rc.4
+version: 3.18.0
summary: Rocket.Chat server
description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
confinement: strict
diff --git a/HISTORY.md b/HISTORY.md
index 559b6b6fd803..7b18c12437e4 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,144 +1,28 @@
-# 3.18.0 (Under Release Candidate Process)
+# 3.18.0
+`2021-08-31 · 5 🎉 · 7 🚀 · 20 🐛 · 19 🔍 · 25 👩💻👨💻`
-## 3.18.0-rc.4
-`2021-08-31 · 1 🔍 · 1 👩💻👨💻`
-
-
-🔍 Minor changes
-
-
-- Bump: Fuselage 0.29.0 ([#23067](https://github.com/RocketChat/Rocket.Chat/pull/23067))
-
-
-
-### 👩💻👨💻 Core Team 🤓
-
-- [@ggazzo](https://github.com/ggazzo)
-
-## 3.18.0-rc.3
-`2021-08-30 · 8 🐛 · 2 🔍 · 9 👩💻👨💻`
-
-### 🐛 Bug fixes
-
-
-- "Click to Join" button is not working if there are no muted users in the room ([#22871](https://github.com/RocketChat/Rocket.Chat/pull/22871))
-
- - Add check to `room.muted` array so as to cover the case in which it is `undefined`;
-
-- applyChatRestictions callback not working for community version ([#22839](https://github.com/RocketChat/Rocket.Chat/pull/22839) by [@Shailesh351](https://github.com/Shailesh351))
-
- Building on top of https://github.com/RocketChat/Rocket.Chat/pull/22838
-
-- Apps-Engine's scheduler failing to update run tasks ([#22882](https://github.com/RocketChat/Rocket.Chat/pull/22882))
-
- [Agenda](https://github.com/agenda/agenda), the library that manages scheduling, depended on setting a job property named `nextRunAt` as `undefined` to signal whether it should be run on schedule or not. [Rocket.Chat's current Mongo driver](https://github.com/RocketChat/Rocket.Chat/pull/22399) ignores `undefined` values when updating documents and this was causing jobs to never stop running as Agenda couldn't clear that property (set them as `undefined`).
- This updates Rocket.Chat's dependency on Agenda.js to point to [a fork that fixes the problem](https://github.com/RocketChat/agenda/releases/tag/3.1.2).
-
-- Close omnichannel conversations when agent is deactivated ([#22917](https://github.com/RocketChat/Rocket.Chat/pull/22917))
-
-- Error getting default agent when routing system algorithm is Auto Selection ([#22976](https://github.com/RocketChat/Rocket.Chat/pull/22976))
-
-- Fix Auto Selection algorithm on community edition ([#22991](https://github.com/RocketChat/Rocket.Chat/pull/22991))
-
- - When using the autoselection algo on community editions, all agents were marked as unavailable due to an unapplied filter
- - Fixed an issue when both user & system setting to manange EE max number of chats allowed were set to 0
-
-- Message update not working in some cases ([#22856](https://github.com/RocketChat/Rocket.Chat/pull/22856))
-
-- Use correct param on saveBusinessHour method ([#22835](https://github.com/RocketChat/Rocket.Chat/pull/22835))
-
-
-🔍 Minor changes
-
-
-- Release 3.17.1 ([#22942](https://github.com/RocketChat/Rocket.Chat/pull/22942))
-
-- Release 3.17.2 ([#23045](https://github.com/RocketChat/Rocket.Chat/pull/23045))
-
-
-
-### 👩💻👨💻 Contributors 😍
-
-- [@Shailesh351](https://github.com/Shailesh351)
-
-### 👩💻👨💻 Core Team 🤓
+### Engine versions
+- Node: `12.22.1`
+- NPM: `6.14.1`
+- MongoDB: `3.4, 3.6, 4.0, 4.2`
+- Apps-Engine: `1.27.1`
-- [@KevLehman](https://github.com/KevLehman)
-- [@d-gubert](https://github.com/d-gubert)
-- [@matheusbsilva137](https://github.com/matheusbsilva137)
-- [@murtaza98](https://github.com/murtaza98)
-- [@renatobecker](https://github.com/renatobecker)
-- [@sampaiodiego](https://github.com/sampaiodiego)
-- [@tassoevan](https://github.com/tassoevan)
-- [@thassiov](https://github.com/thassiov)
+### 🎉 New features
-## 3.18.0-rc.2
-`2021-08-30 · 1 🎉 · 1 🔍 · 2 👩💻👨💻`
-### 🎉 New features
+- **ENTERPRISE:** Maximum waiting time for chats in Omnichannel queue ([#22955](https://github.com/RocketChat/Rocket.Chat/pull/22955))
+ - Add new settings to support closing chats that have been too long on waiting queue
+ - Moved old settings to new "Queue Management" section
+ - Fix issue when closing a livechat room that caused client to not to know if room was open or not
- Banner for the updates regarding authentication services ([#23055](https://github.com/RocketChat/Rocket.Chat/pull/23055))
Add a banner to inform admins about future authentication changes. This banner targets servers that use some sort of authentication service since they're the ones which this update concerns the most.
-
-🔍 Minor changes
-
-
-- Regression: Logs were missing from Omnichannel callback methods ([#23048](https://github.com/RocketChat/Rocket.Chat/pull/23048))
-
-
-
-### 👩💻👨💻 Core Team 🤓
-
-- [@KevLehman](https://github.com/KevLehman)
-- [@g-thome](https://github.com/g-thome)
-
-## 3.18.0-rc.1
-`2021-08-26 · 1 🎉 · 1 🐛 · 1 🔍 · 4 👩💻👨💻`
-
-### 🎉 New features
-
-
- Report "Read Receipts" setting on stat collector ([#23033](https://github.com/RocketChat/Rocket.Chat/pull/23033))
-### 🐛 Bug fixes
-
-
-- Fix Auto Selection algorithm on community edition ([#22991](https://github.com/RocketChat/Rocket.Chat/pull/22991))
-
- - When using the autoselection algo on community editions, all agents were marked as unavailable due to an unapplied filter
- - Fixed an issue when both user & system setting to manange EE max number of chats allowed were set to 0
-
-
-🔍 Minor changes
-
-
-- Regression: Attachment not rendering on message ([#23046](https://github.com/RocketChat/Rocket.Chat/pull/23046))
-
-
-
-### 👩💻👨💻 Core Team 🤓
-
-- [@KevLehman](https://github.com/KevLehman)
-- [@gabriellsh](https://github.com/gabriellsh)
-- [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc)
-- [@renatobecker](https://github.com/renatobecker)
-
-## 3.18.0-rc.0
-`2021-08-23 · 3 🎉 · 7 🚀 · 27 🐛 · 14 🔍 · 26 👩💻👨💻`
-
-### 🎉 New features
-
-
-- **ENTERPRISE:** Maximum waiting time for chats in Omnichannel queue ([#22955](https://github.com/RocketChat/Rocket.Chat/pull/22955))
-
- - Add new settings to support closing chats that have been too long on waiting queue
- - Moved old settings to new "Queue Management" section
- - Fix issue when closing a livechat room that caused client to not to know if room was open or not
-
- REST endpoint to delete a DM and allow DM for two other users ([#18022](https://github.com/RocketChat/Rocket.Chat/pull/18022) by [@abrom](https://github.com/abrom))
[NEW] Improve DM create/delete API management
@@ -182,10 +66,6 @@
### 🐛 Bug fixes
-- "Click to Join" button is not working if there are no muted users in the room ([#22871](https://github.com/RocketChat/Rocket.Chat/pull/22871))
-
- - Add check to `room.muted` array so as to cover the case in which it is `undefined`;
-
- "Read Only" field description is incorrect when the option is checked ([#21868](https://github.com/RocketChat/Rocket.Chat/pull/21868) by [@epif4nio](https://github.com/epif4nio))
- "Users By Time of the Day" chart displays incorrect data for Local Timezone ([#22836](https://github.com/RocketChat/Rocket.Chat/pull/22836))
@@ -193,15 +73,6 @@
- Add local timezone conversion to the "Users By Time of the Day" chart in the Engagement Dashboard;
- Simplify date creations by using `endOf` and `startOf` methods.
-- applyChatRestictions callback not working for community version ([#22839](https://github.com/RocketChat/Rocket.Chat/pull/22839) by [@Shailesh351](https://github.com/Shailesh351))
-
- Building on top of https://github.com/RocketChat/Rocket.Chat/pull/22838
-
-- Apps-Engine's scheduler failing to update run tasks ([#22882](https://github.com/RocketChat/Rocket.Chat/pull/22882))
-
- [Agenda](https://github.com/agenda/agenda), the library that manages scheduling, depended on setting a job property named `nextRunAt` as `undefined` to signal whether it should be run on schedule or not. [Rocket.Chat's current Mongo driver](https://github.com/RocketChat/Rocket.Chat/pull/22399) ignores `undefined` values when updating documents and this was causing jobs to never stop running as Agenda couldn't clear that property (set them as `undefined`).
- This updates Rocket.Chat's dependency on Agenda.js to point to [a fork that fixes the problem](https://github.com/RocketChat/agenda/releases/tag/3.1.2).
-
- Atlassian Crowd connection not working ([#22996](https://github.com/RocketChat/Rocket.Chat/pull/22996) by [@piotrkochan](https://github.com/piotrkochan))
- Audio recording doesn't stop in direct messages on channel switch ([#22880](https://github.com/RocketChat/Rocket.Chat/pull/22880))
@@ -217,16 +88,10 @@
- Can't access other administration menus after opening Engagement Dashboard ([#22870](https://github.com/RocketChat/Rocket.Chat/pull/22870))
-- Close omnichannel conversations when agent is deactivated ([#22917](https://github.com/RocketChat/Rocket.Chat/pull/22917))
-
-- Error getting default agent when routing system algorithm is Auto Selection ([#22976](https://github.com/RocketChat/Rocket.Chat/pull/22976))
-
- Go command duplicating subfolder path on iframes. ([#22796](https://github.com/RocketChat/Rocket.Chat/pull/22796))
- Manually approve new users is not applied to SAML users ([#22823](https://github.com/RocketChat/Rocket.Chat/pull/22823))
-- Message update not working in some cases ([#22856](https://github.com/RocketChat/Rocket.Chat/pull/22856))
-
- Production-environment dependencies ([#22868](https://github.com/RocketChat/Rocket.Chat/pull/22868))
`@rocket.chat/icons` was incorrectly referred as development dependency.
@@ -258,8 +123,6 @@
- TypeError on Callout type prop ([#22790](https://github.com/RocketChat/Rocket.Chat/pull/22790) by [@hrahul2605](https://github.com/hrahul2605))
-- Use correct param on saveBusinessHour method ([#22835](https://github.com/RocketChat/Rocket.Chat/pull/22835))
-
- User is still asked for 2FA confirmation even if it is deactivated ([#22801](https://github.com/RocketChat/Rocket.Chat/pull/22801))
- User presence being processes even if presence monitor was disabled ([#22927](https://github.com/RocketChat/Rocket.Chat/pull/22927))
@@ -272,6 +135,8 @@
🔍 Minor changes
+- Bump: Fuselage 0.29.0 ([#23067](https://github.com/RocketChat/Rocket.Chat/pull/23067))
+
- Chore: Enable husky pre-push hook (back again) ([#22994](https://github.com/RocketChat/Rocket.Chat/pull/22994))
- Chore: Fix RHEL container build issue due to gpg keyserver deprecation ([#22672](https://github.com/RocketChat/Rocket.Chat/pull/22672) by [@jsm84](https://github.com/jsm84))
@@ -300,6 +165,8 @@
- Merge master into develop & Set version to 3.18.0-develop ([#22834](https://github.com/RocketChat/Rocket.Chat/pull/22834))
+- Regression: Attachment not rendering on message ([#23046](https://github.com/RocketChat/Rocket.Chat/pull/23046))
+
- Regression: File upload name suggestion ([#22953](https://github.com/RocketChat/Rocket.Chat/pull/22953))
Before:
@@ -313,15 +180,20 @@
- Regression: Fix creation of self-DMs ([#23015](https://github.com/RocketChat/Rocket.Chat/pull/23015))
+- Regression: Logs were missing from Omnichannel callback methods ([#23048](https://github.com/RocketChat/Rocket.Chat/pull/23048))
+
- Regression: no-js-action bump version ([#22997](https://github.com/RocketChat/Rocket.Chat/pull/22997))
- Regression: readNow blocked by a invalid condition ([#22952](https://github.com/RocketChat/Rocket.Chat/pull/22952))
+- Release 3.17.1 ([#22942](https://github.com/RocketChat/Rocket.Chat/pull/22942))
+
+- Release 3.17.2 ([#23045](https://github.com/RocketChat/Rocket.Chat/pull/23045))
+
### 👩💻👨💻 Contributors 😍
-- [@Shailesh351](https://github.com/Shailesh351)
- [@abrom](https://github.com/abrom)
- [@aditya-mitra](https://github.com/aditya-mitra)
- [@eltociear](https://github.com/eltociear)
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index a3e7cdead866..e87a1655f2f7 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
{
- "version": "3.18.0-rc.4"
+ "version": "3.18.0"
}
diff --git a/package-lock.json b/package-lock.json
index 217890fdcdcd..ba1e5b1eb155 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "Rocket.Chat",
- "version": "3.18.0-rc.4",
+ "version": "3.18.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index d97995f18b2c..bb1aedd0ce37 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "Rocket.Chat",
"description": "The Ultimate Open Source WebChat Platform",
- "version": "3.18.0-rc.4",
+ "version": "3.18.0",
"author": {
"name": "Rocket.Chat",
"url": "https://rocket.chat/"