From 73bfe73093dc7bf9c46a4a133eae4fceabd3ef1f Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Wed, 11 Sep 2019 23:40:19 -0300 Subject: [PATCH] Bump version to 2.0.0-rc.4 --- .docker/Dockerfile.rhel | 2 +- .github/history.json | 22 ++++++++++++++++++++++ .travis/snap.sh | 2 +- HISTORY.md | 15 +++++++++++++++ app/utils/rocketchat.info | 2 +- package.json | 2 +- 6 files changed, 41 insertions(+), 4 deletions(-) diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index bc4ee33509bc..01f5b851194e 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.3 +ENV RC_VERSION 2.0.0-rc.4 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index ee91dc3d592f..984b9192e391 100644 --- a/.github/history.json +++ b/.github/history.json @@ -34564,6 +34564,28 @@ ] } ] + }, + "2.0.0-rc.4": { + "node_version": "8.11.4", + "npm_version": "6.4.1", + "mongo_versions": [ + "3.4", + "3.6", + "4.0" + ], + "pull_requests": [ + { + "pr": "15336", + "title": "Federation migration and additional improvements", + "userLogin": "sampaiodiego", + "milestone": "2.0.0", + "contributors": [ + "alansikora", + "sampaiodiego", + "web-flow" + ] + } + ] } } } \ No newline at end of file diff --git a/.travis/snap.sh b/.travis/snap.sh index 9b0fb95a30ca..831c305c95d2 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.3 + RC_VERSION=2.0.0-rc.4 fi echo "Preparing to trigger a snap release for $CHANNEL channel" diff --git a/HISTORY.md b/HISTORY.md index d1dd388116ea..11461b405415 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,21 @@ # 2.0.0 (Under Release Candidate Process) +## 2.0.0-rc.4 +`2019-09-11 ยท 1 ๐Ÿ” ยท 2 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +
+๐Ÿ” Minor changes + +- Federation migration and additional improvements ([#15336](https://github.com/RocketChat/Rocket.Chat/pull/15336)) + +
+ +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@alansikora](https://github.com/alansikora) +- [@sampaiodiego](https://github.com/sampaiodiego) + ## 2.0.0-rc.3 `2019-09-10 ยท 2 ๏ธ๏ธ๏ธโš ๏ธ ยท 2 ๐Ÿ› ยท 8 ๐Ÿ” ยท 8 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index bd8b18801048..0d7387063f5e 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "2.0.0-rc.3" + "version": "2.0.0-rc.4" } diff --git a/package.json b/package.json index 15e806fa4c6d..3ac6b331a293 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.3", + "version": "2.0.0-rc.4", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/"