Merge branch 'develop' into docker-compose-wait

RocketChat · Mar 2, 2019 · 5784652 · 5784652
2 parents 8268447 + 1343fe6
commit 5784652
Show file tree

Hide file tree

Showing 1,652 changed files with 20,837 additions and 17,152 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.74.0-develop
+ENV RC_VERSION 1.0.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 

diff --git a/.eslintrc b/.eslintrc
@@ -4,18 +4,8 @@
 	"globals": {
 		"__meteor_bootstrap__"        : false,
 		"__meteor_runtime_config__"   : false,
-		"Apps"                        : false,
 		"Assets"                      : false,
 		"chrome"                      : false,
-		"DynamicCss"                  : false,
-		"handleError"                 : false,
-		"getAvatarSuggestionForUser"  : false,
-		"JitsiMeetExternalAPI"        : false,
-		"jscolor"                     : false,
-		"msgStream"                   : false,
-		"openRoom"                    : false,
-		"RocketChat"                  : true,
-		"roomExit"                    : true,
-		"Settings"                    : false
+		"jscolor"                     : false
 	}
 }