From cec0bf5dfef6ec30dff4cd08a12c19d6694e1cf8 Mon Sep 17 00:00:00 2001 From: murtaza98 Date: Mon, 11 Jul 2022 11:44:38 +0530 Subject: [PATCH] Bump version to 5.0.0-rc.3 --- .github/history.json | 56 +++++++++++++++++++++++++++ HISTORY.md | 34 ++++++++++++++++ apps/meteor/.docker/Dockerfile.rhel | 2 +- apps/meteor/app/utils/rocketchat.info | 2 +- apps/meteor/package.json | 2 +- package.json | 2 +- 6 files changed, 94 insertions(+), 4 deletions(-) diff --git a/.github/history.json b/.github/history.json index 0a8c1e3ad08..d34ccf677c1 100644 --- a/.github/history.json +++ b/.github/history.json @@ -98954,6 +98954,62 @@ ] } ] + }, + "5.0.0-rc.3": { + "node_version": "14.19.3", + "npm_version": "6.14.17", + "mongo_versions": [ + "4.2", + "4.4", + "5.0" + ], + "pull_requests": [ + { + "pr": "26201", + "title": "Chore: Info page", + "userLogin": "ggazzo", + "contributors": [ + "ggazzo" + ] + }, + { + "pr": "26199", + "title": "Regression: Fix command previews", + "userLogin": "d-gubert", + "description": "Fixes slash command previews not being showed", + "milestone": "5.0.0", + "contributors": [ + "d-gubert" + ] + }, + { + "pr": "26205", + "title": "Chore: Change Apps-Engine version source for info", + "userLogin": "d-gubert", + "description": "Now that we're using `yarn`, the version stored in the `package.json` is no longer the resolved one, but it matches the input. This means that when we ran `yarn add @rocket.chat/apps-engine@alpha`, yarn saves `\"alpha\"` as the version of the package, while NPM added the resolved version for the tag, e.g. `\"1.33.0-alpha.6507\"`. This ends up breaking a few places where we need the Apps-Engine version for communication with the Marketplace.\r\n\r\nWith this PR we change the source of that info so the problem doesn't happen anymore.", + "milestone": "5.0.0", + "contributors": [ + "d-gubert" + ] + }, + { + "pr": "26148", + "title": "Regression: moving Community Watermark to `ee` folder", + "userLogin": "hugocostadev", + "description": "Due to legal reasons, the Watermark used in community Edition was moved to Enterprise folder `ee`", + "contributors": [ + "hugocostadev" + ] + }, + { + "pr": "26136", + "title": "Regression: Send files with `enter` key", + "userLogin": "gabriellsh", + "contributors": [ + "gabriellsh" + ] + } + ] } } } \ No newline at end of file diff --git a/HISTORY.md b/HISTORY.md index f8a4e428f05..f5aa2227f93 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,40 @@ # 5.0.0 (Under Release Candidate Process) +## 5.0.0-rc.3 +`2022-07-11 ยท 5 ๐Ÿ” ยท 4 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +
+๐Ÿ” Minor changes + + +- Chore: Change Apps-Engine version source for info ([#26205](https://github.com/RocketChat/Rocket.Chat/pull/26205)) + + Now that we're using `yarn`, the version stored in the `package.json` is no longer the resolved one, but it matches the input. This means that when we ran `yarn add @rocket.chat/apps-engine@alpha`, yarn saves `"alpha"` as the version of the package, while NPM added the resolved version for the tag, e.g. `"1.33.0-alpha.6507"`. This ends up breaking a few places where we need the Apps-Engine version for communication with the Marketplace. + + With this PR we change the source of that info so the problem doesn't happen anymore. + +- Chore: Info page ([#26201](https://github.com/RocketChat/Rocket.Chat/pull/26201)) + +- Regression: Fix command previews ([#26199](https://github.com/RocketChat/Rocket.Chat/pull/26199)) + + Fixes slash command previews not being showed + +- Regression: moving Community Watermark to `ee` folder ([#26148](https://github.com/RocketChat/Rocket.Chat/pull/26148)) + + Due to legal reasons, the Watermark used in community Edition was moved to Enterprise folder `ee` + +- Regression: Send files with `enter` key ([#26136](https://github.com/RocketChat/Rocket.Chat/pull/26136)) + +
+ +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@d-gubert](https://github.com/d-gubert) +- [@gabriellsh](https://github.com/gabriellsh) +- [@ggazzo](https://github.com/ggazzo) +- [@hugocostadev](https://github.com/hugocostadev) + ## 5.0.0-rc.2 `2022-07-08 ยท 11 ๐Ÿ” ยท 10 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index 7bb06163bc8..eccafdd3018 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 5.0.0-rc.2 +ENV RC_VERSION 5.0.0-rc.3 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index 2363f8611d7..6d908b46dea 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "5.0.0-rc.2" + "version": "5.0.0-rc.3" } diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 4c50c4bf5aa..1fbf23b9974 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "5.0.0-rc.2", + "version": "5.0.0-rc.3", "private": true, "author": { "name": "Rocket.Chat", diff --git a/package.json b/package.json index 8ccb1a89210..ecb02355d5e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "5.0.0-rc.2", + "version": "5.0.0-rc.3", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true,