From dee5cc2bda65e47416525fed5c6604b03bb65b65 Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Mon, 28 Dec 2020 23:44:47 -0300 Subject: [PATCH] Bump version to 3.10.0-rc.3 --- .docker/Dockerfile.rhel | 2 +- .github/history.json | 41 ++++++++++++++++++++++++++ .snapcraft/resources/prepareRocketChat | 2 +- .snapcraft/snap/snapcraft.yaml | 2 +- HISTORY.md | 29 ++++++++++++++++++ app/utils/rocketchat.info | 2 +- package-lock.json | 2 +- package.json | 2 +- 8 files changed, 76 insertions(+), 6 deletions(-) diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index 62c311312fc..675a672c16c 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.2 +ENV RC_VERSION 3.10.0-rc.3 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index 577624d9ac3..3492173f881 100644 --- a/.github/history.json +++ b/.github/history.json @@ -53631,6 +53631,47 @@ ] } ] + }, + "3.10.0-rc.3": { + "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": "19981", + "title": "Regression: polishing licenses endpoints ", + "userLogin": "g-thome", + "contributors": [ + "g-thome", + "sampaiodiego" + ] + }, + { + "pr": "19980", + "title": "Regression: Double Scrollbars on tables", + "userLogin": "gabriellsh", + "description": "Before:\r\n![image](https://user-images.githubusercontent.com/40830821/103242719-0ec84680-4936-11eb-87a7-68b6eea8de7b.png)\r\n\r\n\r\nAfter:\r\n![image](https://user-images.githubusercontent.com/40830821/103242680-ee988780-4935-11eb-99e2-a95de99f78f1.png)", + "contributors": [ + "gabriellsh", + "ggazzo" + ] + }, + { + "pr": "19955", + "title": "Regression: Add currently running instance to instances.get endpoint", + "userLogin": "g-thome", + "milestone": "3.10.0", + "contributors": [ + "g-thome", + "sampaiodiego" + ] + } + ] } } } \ No newline at end of file diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat index 3ea8dcb50e0..65f87f58d13 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.2/download/" -o rocket.chat.tgz +curl -SLf "https://releases.rocket.chat/3.10.0-rc.3/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 af9bb52fff4..a6dd18c29b5 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.2 +version: 3.10.0-rc.3 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 6a57a6cd469..103526deb30 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,35 @@ # 3.10.0 (Under Release Candidate Process) +## 3.10.0-rc.3 +`2020-12-28 ยท 3 ๐Ÿ” ยท 4 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +
+๐Ÿ” Minor changes + + +- Regression: Add currently running instance to instances.get endpoint ([#19955](https://github.com/RocketChat/Rocket.Chat/pull/19955)) + +- Regression: Double Scrollbars on tables ([#19980](https://github.com/RocketChat/Rocket.Chat/pull/19980)) + + Before: + ![image](https://user-images.githubusercontent.com/40830821/103242719-0ec84680-4936-11eb-87a7-68b6eea8de7b.png) + + + After: + ![image](https://user-images.githubusercontent.com/40830821/103242680-ee988780-4935-11eb-99e2-a95de99f78f1.png) + +- Regression: polishing licenses endpoints ([#19981](https://github.com/RocketChat/Rocket.Chat/pull/19981)) + +
+ +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@g-thome](https://github.com/g-thome) +- [@gabriellsh](https://github.com/gabriellsh) +- [@ggazzo](https://github.com/ggazzo) +- [@sampaiodiego](https://github.com/sampaiodiego) + ## 3.10.0-rc.2 `2020-12-28 ยท 3 ๐Ÿ› ยท 5 ๐Ÿ” ยท 8 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index 640761bd370..ff6e28358b1 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "3.10.0-rc.2" + "version": "3.10.0-rc.3" } diff --git a/package-lock.json b/package-lock.json index a437f2d9c6e..f8000fdbd99 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Rocket.Chat", - "version": "3.10.0-rc.2", + "version": "3.10.0-rc.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 7353acb017d..6983367ee6a 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.2", + "version": "3.10.0-rc.3", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/"