From e613f2ac5298d49697c094b211e628eb1cb6211d Mon Sep 17 00:00:00 2001 From: Diego Sampaio Date: Thu, 17 Sep 2020 16:20:58 -0300 Subject: [PATCH] Bump version to 3.6.2 --- .docker/Dockerfile.rhel | 2 +- .github/history.json | 79 ++++++++++++++++++++++++++ .snapcraft/resources/prepareRocketChat | 2 +- .snapcraft/snap/snapcraft.yaml | 2 +- HISTORY.md | 42 ++++++++++++++ app/utils/rocketchat.info | 2 +- package-lock.json | 2 +- package.json | 2 +- 8 files changed, 127 insertions(+), 6 deletions(-) diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index 7bb70bfcbb0..18c9bbe0669 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 3.6.1 +ENV RC_VERSION 3.6.2 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index e68ca04ba22..42943629a46 100644 --- a/.github/history.json +++ b/.github/history.json @@ -49264,6 +49264,85 @@ ] } ] + }, + "3.6.2": { + "node_version": "12.16.1", + "npm_version": "6.14.0", + "apps_engine_version": "1.17.0", + "mongo_versions": [ + "3.4", + "3.6", + "4.0" + ], + "pull_requests": [ + { + "pr": "18794", + "title": "[FIX] Show custom fields of invalid type", + "userLogin": "gabriellsh", + "milestone": "3.6.2", + "contributors": [ + "gabriellsh" + ] + }, + { + "pr": "18864", + "title": "[FIX] Deactivate users that are the last owner of a room using REST API", + "userLogin": "FelipeParreira", + "description": "Allow for user deactivation through REST API (even if user is the last owner of a room)", + "milestone": "3.6.2", + "contributors": [ + "FelipeParreira", + "sampaiodiego", + "web-flow" + ] + }, + { + "pr": "18866", + "title": "[FIX] Ignore User action from user card", + "userLogin": "pierre-lehnen-rc", + "milestone": "3.6.2", + "contributors": [ + "pierre-lehnen-rc" + ] + }, + { + "pr": "18916", + "title": "[FIX] Version update check cron job", + "userLogin": "wreiske", + "milestone": "3.6.2", + "contributors": [ + "wreiske" + ] + }, + { + "pr": "18918", + "title": "[FIX] Read receipts showing blank names and not marking messages as read", + "userLogin": "wreiske", + "milestone": "3.6.2", + "contributors": [ + "wreiske" + ] + }, + { + "pr": "17377", + "title": "[FIX] Create Custom OAuth services from environment variables", + "userLogin": "mrtndwrd", + "milestone": "3.6.2", + "contributors": [ + "mrtndwrd", + "web-flow" + ] + }, + { + "pr": "18919", + "title": "[FIX] invite-all-from and invite-all-to commands don't work with multibyte room names", + "userLogin": "FelipeParreira", + "description": "Fix slash commands (invite-all-from and invite-all-to) to accept multi-byte room names.", + "contributors": [ + "FelipeParreira" + ] + } + ] } } } \ No newline at end of file diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat index dc5cc39db64..ae80eee9a68 100755 --- a/.snapcraft/resources/prepareRocketChat +++ b/.snapcraft/resources/prepareRocketChat @@ -1,6 +1,6 @@ #!/bin/bash -curl -SLf "https://releases.rocket.chat/3.6.1/download/" -o rocket.chat.tgz +curl -SLf "https://releases.rocket.chat/3.6.2/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 3b4bad1d80d..7227487ad9b 100644 --- a/.snapcraft/snap/snapcraft.yaml +++ b/.snapcraft/snap/snapcraft.yaml @@ -7,7 +7,7 @@ # 5. `snapcraft snap` name: rocketchat-server -version: 3.6.1 +version: 3.6.2 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 d447e35f3a4..80212b9c69a 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,46 @@ +# 3.6.2 +`2020-09-17 ยท 7 ๐Ÿ› ยท 6 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +### Engine versions +- Node: `12.16.1` +- NPM: `6.14.0` +- MongoDB: `3.4, 3.6, 4.0` +- Apps-Engine: `1.17.0` + +### ๐Ÿ› Bug fixes + + +- Create Custom OAuth services from environment variables ([#17377](https://github.com/RocketChat/Rocket.Chat/pull/17377) by [@mrtndwrd](https://github.com/mrtndwrd)) + +- Deactivate users that are the last owner of a room using REST API ([#18864](https://github.com/RocketChat/Rocket.Chat/pull/18864)) + + Allow for user deactivation through REST API (even if user is the last owner of a room) + +- Ignore User action from user card ([#18866](https://github.com/RocketChat/Rocket.Chat/pull/18866)) + +- invite-all-from and invite-all-to commands don't work with multibyte room names ([#18919](https://github.com/RocketChat/Rocket.Chat/pull/18919)) + + Fix slash commands (invite-all-from and invite-all-to) to accept multi-byte room names. + +- Read receipts showing blank names and not marking messages as read ([#18918](https://github.com/RocketChat/Rocket.Chat/pull/18918) by [@wreiske](https://github.com/wreiske)) + +- Show custom fields of invalid type ([#18794](https://github.com/RocketChat/Rocket.Chat/pull/18794)) + +- Version update check cron job ([#18916](https://github.com/RocketChat/Rocket.Chat/pull/18916) by [@wreiske](https://github.com/wreiske)) + +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Contributors ๐Ÿ˜ + +- [@mrtndwrd](https://github.com/mrtndwrd) +- [@wreiske](https://github.com/wreiske) + +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@FelipeParreira](https://github.com/FelipeParreira) +- [@gabriellsh](https://github.com/gabriellsh) +- [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) +- [@sampaiodiego](https://github.com/sampaiodiego) + # 3.6.1 `2020-09-11 ยท 7 ๐Ÿ› ยท 3 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index b5f6e0bc1f4..07887f4dde2 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "3.6.1" + "version": "3.6.2" } diff --git a/package-lock.json b/package-lock.json index 092ba07e31a..84971a4d8c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Rocket.Chat", - "version": "3.6.1", + "version": "3.6.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e482bed3d73..1a0b50aa731 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "3.6.1", + "version": "3.6.2", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/"