diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index b761aa183ea..c89ca0c9c9c 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 1.2.0 +ENV RC_VERSION 1.2.1 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index a0dcfbc8fe9..72672adc6be 100644 --- a/.github/history.json +++ b/.github/history.json @@ -32504,6 +32504,27 @@ ] } ] + }, + "1.2.1": { + "node_version": "8.11.4", + "npm_version": "6.4.1", + "mongo_versions": [ + "3.2", + "3.4", + "3.6", + "4.0" + ], + "pull_requests": [ + { + "pr": "14894", + "title": "[FIX] Not showing local app on App Details", + "userLogin": "d-gubert", + "milestone": "1.2.1", + "contributors": [ + "d-gubert" + ] + } + ] } } } \ No newline at end of file diff --git a/.travis/snap.sh b/.travis/snap.sh index c08229cd2ce..1ae2d0f9e0e 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=1.2.0 + RC_VERSION=1.2.1 fi echo "Preparing to trigger a snap release for $CHANNEL channel" diff --git a/HISTORY.md b/HISTORY.md index 00aa2066df3..85382510597 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,20 @@ +# 1.2.1 +`2019-06-28 ยท 1 ๐Ÿ› ยท 1 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +### Engine versions +- Node: `8.11.4` +- NPM: `6.4.1` +- MongoDB: `3.2, 3.4, 3.6, 4.0` + +### ๐Ÿ› Bug fixes + +- Not showing local app on App Details ([#14894](https://github.com/RocketChat/Rocket.Chat/pull/14894)) + +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@d-gubert](https://github.com/d-gubert) + # 1.2.0 `2019-06-27 ยท 8 ๐ŸŽ‰ ยท 4 ๐Ÿš€ ยท 12 ๐Ÿ› ยท 8 ๐Ÿ” ยท 21 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index 6664c2c1265..ed7dbc8b44d 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "1.2.0" + "version": "1.2.1" } diff --git a/package.json b/package.json index 1894c11eb6e..bcfa1a9f276 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "1.2.0", + "version": "1.2.1", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/"