From 6dc57e1331142dbdbe71bb265d0ef2d3089a3a2a Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Wed, 28 Aug 2019 10:58:19 -0300 Subject: [PATCH] Bump version to 2.0.0-rc.2 --- .docker/Dockerfile.rhel | 2 +- .github/history.json | 56 +++++++++++++++++++++++++++++++++++++++ .travis/snap.sh | 2 +- HISTORY.md | 20 ++++++++++++++ app/utils/rocketchat.info | 2 +- package.json | 2 +- 6 files changed, 80 insertions(+), 4 deletions(-) diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index d1b74384168..27825da7634 100644 --- a/.docker/Dockerfile.rhel +++ b/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7 -ENV RC_VERSION 2.0.0-rc.1 +ENV RC_VERSION 2.0.0-rc.2 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index ac31ca75b7a..a73dc19e2f5 100644 --- a/.github/history.json +++ b/.github/history.json @@ -34380,6 +34380,62 @@ ] } ] + }, + "2.0.0-rc.2": { + "node_version": "8.11.4", + "npm_version": "6.4.1", + "mongo_versions": [ + "3.4", + "3.6", + "4.0" + ], + "pull_requests": [ + { + "pr": "15268", + "title": "Regression: Double error toast on Setup Wizard", + "userLogin": "tassoevan", + "milestone": "2.0.0", + "contributors": [ + "tassoevan" + ] + }, + { + "pr": "15267", + "title": "Regression: addPermissionToRole argument as string", + "userLogin": "ggazzo", + "milestone": "2.0.0", + "contributors": [ + "ggazzo" + ] + }, + { + "pr": "15263", + "title": "Regression: Remove old scripts of Setup Wizard", + "userLogin": "tassoevan", + "milestone": "2.0.0", + "contributors": [ + "tassoevan", + "ggazzo", + "web-flow" + ] + }, + { + "pr": "15262", + "title": "Fix get IP for rate limiter", + "userLogin": "sampaiodiego", + "contributors": [ + "sampaiodiego" + ] + }, + { + "pr": "15249", + "title": "Add oplog events metrics", + "userLogin": "sampaiodiego", + "contributors": [ + "sampaiodiego" + ] + } + ] } } } \ No newline at end of file diff --git a/.travis/snap.sh b/.travis/snap.sh index 272613b5d23..1da53c53a73 100755 --- a/.travis/snap.sh +++ b/.travis/snap.sh @@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then RC_VERSION=$TRAVIS_TAG else CHANNEL=edge - RC_VERSION=2.0.0-rc.1 + RC_VERSION=2.0.0-rc.2 fi echo "Preparing to trigger a snap release for $CHANNEL channel" diff --git a/HISTORY.md b/HISTORY.md index ade95087966..d141f425e04 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,26 @@ # 2.0.0 (Under Release Candidate Process) +## 2.0.0-rc.2 +`2019-08-28 ยท 5 ๐Ÿ” ยท 3 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +
+๐Ÿ” Minor changes + +- Regression: Double error toast on Setup Wizard ([#15268](https://github.com/RocketChat/Rocket.Chat/pull/15268)) +- Regression: addPermissionToRole argument as string ([#15267](https://github.com/RocketChat/Rocket.Chat/pull/15267)) +- Regression: Remove old scripts of Setup Wizard ([#15263](https://github.com/RocketChat/Rocket.Chat/pull/15263)) +- Fix get IP for rate limiter ([#15262](https://github.com/RocketChat/Rocket.Chat/pull/15262)) +- Add oplog events metrics ([#15249](https://github.com/RocketChat/Rocket.Chat/pull/15249)) + +
+ +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@ggazzo](https://github.com/ggazzo) +- [@sampaiodiego](https://github.com/sampaiodiego) +- [@tassoevan](https://github.com/tassoevan) + ## 2.0.0-rc.1 `2019-08-23 ยท 2 ๐Ÿ” ยท 2 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index cdbc6ddcd1e..94635791193 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "2.0.0-rc.1" + "version": "2.0.0-rc.2" } diff --git a/package.json b/package.json index 9b5b2acb9ca..8d502f45030 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "2.0.0-rc.1", + "version": "2.0.0-rc.2", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/"