Merge pull request #681 from assistify/merge/3.8.3

Merge tag '3.8.3'

.docker-mongo/Dockerfile

@@ -3,13 +3,22 @@ FROM node:12.18.4-buster-slim
 LABEL maintainer="[email protected]"
 
 # Install MongoDB and dependencies
+ENV MONGO_MAJOR 4.2
+ENV MONGO_VERSION 4.2.10
+
 RUN set -x \
     && apt-get update \
     && apt-get install -y wget gnupg dirmngr pwgen \
-    && wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | apt-key add - \
-    && echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list \
+    && wget -qO - "https://www.mongodb.org/static/pgp/server-${MONGO_MAJOR}.asc" | apt-key add - \
+    && echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/$MONGO_MAJOR main" | tee "/etc/apt/sources.list.d/mongodb-org-${MONGO_MAJOR}.list" \
     && apt-get update \
-    && apt-get install -y mongodb-org fontconfig \
+    && apt-get install -y \
+       mongodb-org=$MONGO_VERSION \
+       mongodb-org-server=$MONGO_VERSION \
+       mongodb-org-shell=$MONGO_VERSION \
+       mongodb-org-mongos=$MONGO_VERSION \
+       mongodb-org-tools=$MONGO_VERSION \
+       fontconfig \
     && apt-get clean my room \
     && groupadd -g 65533 -r rocketchat \
     && useradd -u 65533 -r -g rocketchat rocketchat \

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.7.1
+ENV RC_VERSION 3.8.3
 
 MAINTAINER [email protected]
 

.eslintignore

@@ -18,3 +18,4 @@ public/pdf.worker.min.js
 public/workers/**/*
 imports/client/
 !/.storybook/
+ee/server/services/dist/**

.eslintrc

@@ -27,7 +27,9 @@
       "syntax"
     ],
     "react-hooks/rules-of-hooks": "error",
-    "react-hooks/exhaustive-deps": "warn"
+    "react-hooks/exhaustive-deps": ["warn", {
+      "additionalHooks": "(useComponentDidUpdate)"
+    }]
   },
   "settings": {
     "import/resolver": {

.github/history-manual.json

@@ -28,5 +28,19 @@
 		"userLogin": "rodrigok",
 		"contributors": [],
 		"description": "Requires the 2FA password fallback enforcement enabled to work"
+	}],
+	"3.7.3": [{
+		"title": "[FIX] Exception on certain login cases including SAML",
+		"userLogin": "sampaiodiego",
+		"contributors": [
+			"sampaiodiego"
+		]
+	}],
+	"3.8.3": [{
+		"title": "[FIX] Exception on certain login cases including SAML",
+		"userLogin": "sampaiodiego",
+		"contributors": [
+			"sampaiodiego"
+		]
 	}]
 }