Merge remote-tracking branch 'origin/develop' into lazy-load-apps-cat…

…egories
RocketChat · Feb 28, 2020 · f1e49e5 · f1e49e5
2 parents 826a97e + 6f0e929
commit f1e49e5
Show file tree

Hide file tree

Showing 550 changed files with 19,243 additions and 17,500 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,5 @@
+{
+	"presets": [
+		"@babel/preset-env"
+	]
+}
diff --git a/.docker-mongo/Dockerfile b/.docker-mongo/Dockerfile
@@ -1,4 +1,4 @@
-FROM rocketchat/base:8
+FROM rocketchat/base:12.14.0
 
 ADD . /app
 ADD entrypoint.sh /app/bundle/

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM rocketchat/base:8.17.0
+FROM rocketchat/base:12.14.0
 
 ADD . /app
 

diff --git 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.5.0-develop
+ENV RC_VERSION 3.1.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 

diff --git a/.github/history-manual.json b/.github/history-manual.json
@@ -16,5 +16,10 @@
 		"title": "[BREAK] Support for Cordova (Rocket.Chat Legacy app) has reached End-of-life, support has been discontinued",
 		"userLogin": "sampaiodiego",
 		"contributors": []
+	}],
+	"3.0.0-rc.9": [{
+		"title": "[BREAK] TLS v1.0 and TLS v1.1 were disabled by due to NodeJS update to v12. You can still enable them by using flags like `--tls-min-v1.0` and `--tls-min-v1.1`",
+		"userLogin": "sampaiodiego",
+		"contributors": []
 	}]
 }