Merge master into develop & Set version to 4.1.0-develop (#23362)

4 years ago · 8acece6a4e
parent bc506931e7
commit 8acece6a4e
8 changed files with 2758 additions and 1025 deletions
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12

-ENV RC_VERSION 4.0.0-develop
+ENV RC_VERSION 4.1.0-develop

 MAINTAINER buildmaster@rocket.chat

--- a/.github/history.json
+++ b/.github/history.json
--- a/.snapcraft/resources/prepareRocketChat
+++ b/.snapcraft/resources/prepareRocketChat
@ -1,6 +1,6 @@
 #!/bin/bash

-curl -SLf "https://releases.rocket.chat/4.0.0-develop/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/4.1.0-develop/download/" -o rocket.chat.tgz

 tar xf rocket.chat.tgz --strip 1

--- a/.snapcraft/snap/snapcraft.yaml
+++ b/.snapcraft/snap/snapcraft.yaml
@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`

 name: rocketchat-server
-version: 4.0.0-develop
+version: 4.1.0-develop
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict
--- a/HISTORY.md
+++ b/HISTORY.md
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@ -1,3 +1,3 @@
 {
-	"version": "4.0.0-develop"
+	"version": "4.1.0-develop"
 }
--- a/package-lock.json
+++ b/package-lock.json
@ -1,6 +1,6 @@
 {
  "name": "Rocket.Chat",
-  "version": "4.0.0-develop",
+  "version": "4.1.0-develop",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "4.0.0-develop",
+	"version": "4.1.0-develop",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"