Merge pull request RocketChat#630 from WideChat/develop_pwa-catchup-0…

…c7fbf4 [Upstream Catchup] Merge RC:master to develop_pwa
Shailesh351 · Apr 29, 2021 · 2bdd164 · 2bdd164
2 parents 91998ce + f7124da
commit 2bdd164
Show file tree

Hide file tree

Showing 1,616 changed files with 93,168 additions and 71,790 deletions.
diff --git a/.docker-mongo/Dockerfile b/.docker-mongo/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.21.0-buster-slim
+FROM node:12.22.1-buster-slim
 
 LABEL maintainer="[email protected]"
 

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.21.0-buster-slim
+FROM node:12.22.1-buster-slim
 
 LABEL maintainer="[email protected]"
 

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 3.13.2
+ENV RC_VERSION 3.14.0
 
 MAINTAINER [email protected]
 

diff --git a/.eslintignore b/.eslintignore
@@ -18,5 +18,7 @@ imports/client/
 !/.storybook/
 ee/server/services/dist/**
 !/.mocharc.js
+!/client/.eslintrc.js
+!/ee/client/.eslintrc.js
 app/utils/client/lib/sha1.js
 app/analytics/server/trackEvents.js