diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12a79b5be918029bb07865a6b963bb8a5979ecae..0813926e4fca9b6acab96ec9cd41e301d492c989 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,6 +38,7 @@ jobs: - uses: Bhacaz/checkout-files@v2 with: files: package.json + branch: ${{ github.head_ref || github.ref_name }} - id: var run: | diff --git a/HISTORY.md b/HISTORY.md index 7fa02761deea84d211c859878a312c72fa64debd..bae8f494b34dba06ed192138594df93b519c6d22 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,25 @@ +# 6.1.1 +`2023-04-04 · 1 🛠· 3 👩â€ðŸ’»ðŸ‘¨â€ðŸ’»` + +### Engine versions +- Node: `14.21.2` +- NPM: `6.14.17` +- MongoDB: `4.4, 5.0, 6.0` +- Apps-Engine: `1.38.0` + +### 🛠Bug fixes + + +- Messages jumping after reaction ([#28770](https://github.com/RocketChat/Rocket.Chat/pull/28770)) + +### 👩â€ðŸ’»ðŸ‘¨â€ðŸ’» Core Team 🤓 + +- [@casalsgh](https://github.com/casalsgh) +- [@debdutdeb](https://github.com/debdutdeb) +- [@sampaiodiego](https://github.com/sampaiodiego) + + # 6.1.0 `2023-03-29 · 1 🎉 · 1 🚀 · 4 🛠· 4 🔠· 11 👩â€ðŸ’»ðŸ‘¨â€ðŸ’»` diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index dcf7edd67c2484f66c64e56bd2ff639aaec825db..e847f66691325acebee476ec3cace0208319c6e5 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 6.1.0 +ENV RC_VERSION 6.1.1 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index dca6d967fdaa11d9a5cdb2b67e888fbfacc1b4e4..1012080e6f2f7200165102744ab33c917a258c58 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "6.1.0" + "version": "6.1.1" } diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 182667e8c863b2611f7a3718e2e604b9c5ad61c1..8b34c3ecad6a087698f6439af8d407e422d187d0 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": "6.1.0", + "version": "6.1.1", "private": true, "author": { "name": "Rocket.Chat", diff --git a/package.json b/package.json index bbad95b424b8fb0e7c0f8f866747ffde8f29a3de..9345c64472a4e45f5e0d4f94c0e034b91a26fd12 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "6.1.0", + "version": "6.1.1", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true,