From a1980ec21376dd26a9e0c66a78ca542c6a73714c Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Mon, 28 Dec 2020 19:38:04 -0300 Subject: [PATCH] Bump version to 3.10.0-rc.2 --- .docker/Dockerfile.rhel | 2 +- .github/history.json | 95 ++++++++++++++++++++++++++ .snapcraft/resources/prepareRocketChat | 2 +- .snapcraft/snap/snapcraft.yaml | 2 +- HISTORY.md | 39 +++++++++++ app/utils/rocketchat.info | 2 +- package-lock.json | 2 +- package.json | 2 +- 8 files changed, 140 insertions(+), 6 deletions(-) diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index 89e4b49ccb4..62c311312fc 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.10.0-rc.1 +ENV RC_VERSION 3.10.0-rc.2 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index 1d18293d7de..577624d9ac3 100644 --- a/.github/history.json +++ b/.github/history.json @@ -53536,6 +53536,101 @@ ] } ] + }, + "3.10.0-rc.2": { + "node_version": "12.18.4", + "npm_version": "6.14.8", + "apps_engine_version": "1.21.0-alpha.4235", + "mongo_versions": [ + "3.4", + "3.6", + "4.0" + ], + "pull_requests": [ + { + "pr": "19950", + "title": "Regression: Fix sorting indicators on Admin Users page", + "userLogin": "alansikora", + "milestone": "3.10.0", + "contributors": [ + "alansikora" + ] + }, + { + "pr": "19978", + "title": "Regression: Fix oembed", + "userLogin": "sampaiodiego", + "contributors": [ + "sampaiodiego" + ] + }, + { + "pr": "19935", + "title": "[FIX] Status on searchlist", + "userLogin": "gabriellsh", + "milestone": "3.9.4", + "contributors": [ + "gabriellsh", + "tassoevan", + "web-flow" + ] + }, + { + "pr": "19830", + "title": "[FIX] Omnichannel Departments Canned Responses", + "userLogin": "gabriellsh", + "milestone": "3.9.4", + "contributors": [ + "gabriellsh", + "web-flow", + "renatobecker", + "dougfabris" + ] + }, + { + "pr": "19951", + "title": "Regression: Check permissions properly when fetching rooms in Omnichannel Directory", + "userLogin": "rafaelblink", + "milestone": "3.10.0", + "contributors": [ + "rafaelblink", + "renatobecker", + "web-flow" + ] + }, + { + "pr": "19968", + "title": "Regression: Add missing translations on the Omnichannel Contact Center(Directory)", + "userLogin": "rafaelblink", + "milestone": "3.10.0", + "contributors": [ + "rafaelblink", + "renatobecker" + ] + }, + { + "pr": "19946", + "title": "Regression: Header Styles fixes", + "userLogin": "ggazzo", + "milestone": "3.10.0", + "contributors": [ + "ggazzo", + "tassoevan", + "web-flow" + ] + }, + { + "pr": "19945", + "title": "[FIX] Room scrolling to top after returns to a opened room", + "userLogin": "ggazzo", + "milestone": "3.9.4", + "contributors": [ + "ggazzo", + "tassoevan", + "web-flow" + ] + } + ] } } } \ No newline at end of file diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat index 248bc5d446a..3ea8dcb50e0 100755 --- a/.snapcraft/resources/prepareRocketChat +++ b/.snapcraft/resources/prepareRocketChat @@ -1,6 +1,6 @@ #!/bin/bash -curl -SLf "https://releases.rocket.chat/3.10.0-rc.1/download/" -o rocket.chat.tgz +curl -SLf "https://releases.rocket.chat/3.10.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 589c80e34d9..af9bb52fff4 100644 --- a/.snapcraft/snap/snapcraft.yaml +++ b/.snapcraft/snap/snapcraft.yaml @@ -7,7 +7,7 @@ # 5. `snapcraft snap` name: rocketchat-server -version: 3.10.0-rc.1 +version: 3.10.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 9680c3e08c5..6a57a6cd469 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,45 @@ # 3.10.0 (Under Release Candidate Process) +## 3.10.0-rc.2 +`2020-12-28 ยท 3 ๐Ÿ› ยท 5 ๐Ÿ” ยท 8 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +### ๐Ÿ› Bug fixes + + +- Omnichannel Departments Canned Responses ([#19830](https://github.com/RocketChat/Rocket.Chat/pull/19830)) + +- Room scrolling to top after returns to a opened room ([#19945](https://github.com/RocketChat/Rocket.Chat/pull/19945)) + +- Status on searchlist ([#19935](https://github.com/RocketChat/Rocket.Chat/pull/19935)) + +
+๐Ÿ” Minor changes + + +- Regression: Add missing translations on the Omnichannel Contact Center(Directory) ([#19968](https://github.com/RocketChat/Rocket.Chat/pull/19968)) + +- Regression: Check permissions properly when fetching rooms in Omnichannel Directory ([#19951](https://github.com/RocketChat/Rocket.Chat/pull/19951)) + +- Regression: Fix oembed ([#19978](https://github.com/RocketChat/Rocket.Chat/pull/19978)) + +- Regression: Fix sorting indicators on Admin Users page ([#19950](https://github.com/RocketChat/Rocket.Chat/pull/19950)) + +- Regression: Header Styles fixes ([#19946](https://github.com/RocketChat/Rocket.Chat/pull/19946)) + +
+ +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@alansikora](https://github.com/alansikora) +- [@dougfabris](https://github.com/dougfabris) +- [@gabriellsh](https://github.com/gabriellsh) +- [@ggazzo](https://github.com/ggazzo) +- [@rafaelblink](https://github.com/rafaelblink) +- [@renatobecker](https://github.com/renatobecker) +- [@sampaiodiego](https://github.com/sampaiodiego) +- [@tassoevan](https://github.com/tassoevan) + ## 3.10.0-rc.1 `2020-12-23 ยท 3 ๐Ÿ” ยท 4 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index 09c947fc443..640761bd370 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "3.10.0-rc.1" + "version": "3.10.0-rc.2" } diff --git a/package-lock.json b/package-lock.json index 72e044b1291..a437f2d9c6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Rocket.Chat", - "version": "3.10.0-rc.1", + "version": "3.10.0-rc.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0c6ef0ee310..7353acb017d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "3.10.0-rc.1", + "version": "3.10.0-rc.2", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/"