diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index 1c36b25b7b5..5dd43e5eafa 100644 --- a/.docker/Dockerfile.rhel +++ b/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 4.0.0-rc.1 +ENV RC_VERSION 4.0.0-rc.2 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index 492aba14804..ef68f1562a0 100644 --- a/.github/history.json +++ b/.github/history.json @@ -65656,6 +65656,48 @@ ] } ] + }, + "4.0.0-rc.2": { + "node_version": "12.22.1", + "npm_version": "6.14.1", + "apps_engine_version": "1.28.0-alpha.5428", + "mongo_versions": [ + "3.6", + "4.0", + "4.2", + "4.4", + "5.0" + ], + "pull_requests": [ + { + "pr": "23297", + "title": "Regression: Create new loggers based on server log level", + "userLogin": "sampaiodiego", + "contributors": [ + "sampaiodiego" + ] + }, + { + "pr": "23304", + "title": "Regression: Fix channel icons on queue", + "userLogin": "MartinSchoeler", + "contributors": [ + "KevLehman", + "MartinSchoeler" + ] + }, + { + "pr": "23280", + "title": "[FIX] Update visitor info on email reception based on current inbox settings", + "userLogin": "KevLehman", + "milestone": "4.0.0", + "contributors": [ + "KevLehman", + "murtaza98", + "web-flow" + ] + } + ] } } } \ No newline at end of file diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat index b72ce818a91..30dea3129f7 100755 --- a/.snapcraft/resources/prepareRocketChat +++ b/.snapcraft/resources/prepareRocketChat @@ -1,6 +1,6 @@ #!/bin/bash -curl -SLf "https://releases.rocket.chat/4.0.0-rc.1/download/" -o rocket.chat.tgz +curl -SLf "https://releases.rocket.chat/4.0.0-rc.2/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 0373b6e5d18..31416643eac 100644 --- a/.snapcraft/snap/snapcraft.yaml +++ b/.snapcraft/snap/snapcraft.yaml @@ -7,7 +7,7 @@ # 5. `snapcraft snap` name: rocketchat-server -version: 4.0.0-rc.1 +version: 4.0.0-rc.2 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 6ce8647b180..f664a3816ac 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,31 @@ # 4.0.0 (Under Release Candidate Process) +## 4.0.0-rc.2 +`2021-09-29 ยท 1 ๐Ÿ› ยท 2 ๐Ÿ” ยท 4 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +### ๐Ÿ› Bug fixes + + +- Update visitor info on email reception based on current inbox settings ([#23280](https://github.com/RocketChat/Rocket.Chat/pull/23280)) + +
+๐Ÿ” Minor changes + + +- Regression: Create new loggers based on server log level ([#23297](https://github.com/RocketChat/Rocket.Chat/pull/23297)) + +- Regression: Fix channel icons on queue ([#23304](https://github.com/RocketChat/Rocket.Chat/pull/23304)) + +
+ +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@KevLehman](https://github.com/KevLehman) +- [@MartinSchoeler](https://github.com/MartinSchoeler) +- [@murtaza98](https://github.com/murtaza98) +- [@sampaiodiego](https://github.com/sampaiodiego) + ## 4.0.0-rc.1 `2021-09-27 ยท 2 ๐Ÿ” ยท 2 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index 5e9bb83d383..2bc94337460 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "4.0.0-rc.1" + "version": "4.0.0-rc.2" } diff --git a/package-lock.json b/package-lock.json index 49901965c8b..2366e980cde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Rocket.Chat", - "version": "4.0.0-rc.1", + "version": "4.0.0-rc.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0b8dbc126e4..baa6fe04c93 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "4.0.0-rc.1", + "version": "4.0.0-rc.2", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/"