Merge branch 'develop' into change-registration-message

RocketChat · Oct 17, 2018 · 109132a · 109132a
2 parents 48ff299 + ee3c78d
commit 109132a
Show file tree

Hide file tree

Showing 43 changed files with 4,996 additions and 3,083 deletions.
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 0.70.0-develop
+ENV RC_VERSION 0.71.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 

diff --git a/.eslintrc b/.eslintrc
@@ -1,5 +1,6 @@
 {
 	"extends": ["@rocket.chat/eslint-config"],
+	"parser": "babel-eslint",
 	"globals": {
 		"__meteor_runtime_config__"   : false,
 		"AccountBox"                  : false,
@@ -30,7 +31,7 @@
 		"LivechatDepartment"          : false,
 		"LivechatDepartmentAgents"    : false,
 		"livechatManagerRoutes"       : true,
-		"LivechatMonitoring"          : false,      
+		"LivechatMonitoring"          : false,
 		"LivechatPageVisited"         : false,
 		"LivechatTrigger"             : false,
 		"Logger"                      : false,