diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index 5ba540997e1..d1fc410cdc7 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.14.0-rc.3 +ENV RC_VERSION 3.14.0-rc.4 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index c3fce9d3748..7bc5be0921d 100644 --- a/.github/history.json +++ b/.github/history.json @@ -59454,6 +59454,38 @@ ] } ] + }, + "3.14.0-rc.4": { + "node_version": "12.22.1", + "npm_version": "6.14.1", + "apps_engine_version": "1.25.0", + "mongo_versions": [ + "3.4", + "3.6", + "4.0" + ], + "pull_requests": [ + { + "pr": "21841", + "title": "bump fuselage", + "userLogin": "ggazzo", + "contributors": [ + "ggazzo", + "web-flow" + ] + }, + { + "pr": "21810", + "title": "[FIX] Duplicated header on admin's user contextualbar", + "userLogin": "dougfabris", + "description": "![image](https://user-images.githubusercontent.com/27704687/116125858-5ff60600-a69c-11eb-9859-41f7393b78bf.png)", + "contributors": [ + "dougfabris", + "gabriellsh", + "web-flow" + ] + } + ] } } } \ No newline at end of file diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat index d2ad7017dad..97bda0e8cd2 100755 --- a/.snapcraft/resources/prepareRocketChat +++ b/.snapcraft/resources/prepareRocketChat @@ -1,6 +1,6 @@ #!/bin/bash -curl -SLf "https://releases.rocket.chat/3.14.0-rc.3/download/" -o rocket.chat.tgz +curl -SLf "https://releases.rocket.chat/3.14.0-rc.4/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 1efcf366643..e0f79db1812 100644 --- a/.snapcraft/snap/snapcraft.yaml +++ b/.snapcraft/snap/snapcraft.yaml @@ -7,7 +7,7 @@ # 5. `snapcraft snap` name: rocketchat-server -version: 3.14.0-rc.3 +version: 3.14.0-rc.4 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 a67e939403f..7d1d21f5711 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,30 @@ # 3.14.0 (Under Release Candidate Process) +## 3.14.0-rc.4 +`2021-04-27 ยท 1 ๐Ÿ› ยท 1 ๐Ÿ” ยท 3 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +### ๐Ÿ› Bug fixes + + +- Duplicated header on admin's user contextualbar ([#21810](https://github.com/RocketChat/Rocket.Chat/pull/21810)) + + ![image](https://user-images.githubusercontent.com/27704687/116125858-5ff60600-a69c-11eb-9859-41f7393b78bf.png) + +
+๐Ÿ” Minor changes + + +- bump fuselage ([#21841](https://github.com/RocketChat/Rocket.Chat/pull/21841)) + +
+ +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@dougfabris](https://github.com/dougfabris) +- [@gabriellsh](https://github.com/gabriellsh) +- [@ggazzo](https://github.com/ggazzo) + ## 3.14.0-rc.3 `2021-04-27 ยท 1 ๐Ÿ› ยท 2 ๐Ÿ” ยท 4 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index 570889fd97c..06b00d2c89a 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "3.14.0-rc.3" + "version": "3.14.0-rc.4" } diff --git a/package-lock.json b/package-lock.json index ebcc7eafbab..2c476a8386a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Rocket.Chat", - "version": "3.14.0-rc.3", + "version": "3.14.0-rc.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index bf00e72c095..bd90e93bd09 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "3.14.0-rc.3", + "version": "3.14.0-rc.4", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/"