Merge branch 'develop' into ts-importers

Removed changes from PR #20216 that were made on the old structure - they need to be re-implemented on the new slack importer. # Conflicts: # app/importer-slack/server/importer.js
RocketChat · Apr 7, 2021 · 91be6ad · 91be6ad
2 parents 446e755 + 48d060a
commit 91be6ad
Show file tree

Hide file tree

Showing 938 changed files with 45,330 additions and 13,332 deletions.
diff --git a/.circleci/config.yml.old b/.circleci/config.yml.old
diff --git a/.circleci/namefiles.sh b/.circleci/namefiles.sh
diff --git a/.circleci/redhat-registry.sh b/.circleci/redhat-registry.sh
diff --git a/.circleci/setartname.sh b/.circleci/setartname.sh
diff --git a/.circleci/setdeploydir.sh b/.circleci/setdeploydir.sh
diff --git a/.circleci/setupsig.sh b/.circleci/setupsig.sh
diff --git a/.circleci/snap.sh b/.circleci/snap.sh
diff --git a/.circleci/update-releases.sh b/.circleci/update-releases.sh
diff --git a/.docker-mongo/Dockerfile b/.docker-mongo/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.18.4-buster-slim
+FROM node:12.21.0-buster-slim
 
 LABEL maintainer="buildmaster@rocket.chat"
 

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.18.4-buster-slim
+FROM node:12.21.0-buster-slim
 
 LABEL maintainer="buildmaster@rocket.chat"
 

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.11.0-develop
+ENV RC_VERSION 3.14.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 

diff --git a/.eslintrc b/.eslintrc
@@ -83,7 +83,9 @@
         "indent": "off",
         "no-extra-parens": "off",
         "no-spaced-func": "off",
+        "no-unused-vars": "off",
         "no-useless-constructor": "off",
+        "no-use-before-define": "off",
         "react/jsx-uses-react": "error",
         "react/jsx-uses-vars": "error",
         "react/jsx-no-undef": "error",
@@ -99,6 +101,10 @@
             "SwitchCase": 1
           }
         ],
+        "@typescript-eslint/interface-name-prefix": [
+          "error",
+          "always"
+        ],
         "@typescript-eslint/no-extra-parens": [
           "error",
           "all",
@@ -111,10 +117,9 @@
           }
         ],
         "@typescript-eslint/no-explicit-any": "off",
-        "@typescript-eslint/interface-name-prefix": [
-          "error",
-          "always"
-        ]
+        "@typescript-eslint/no-unused-vars": ["error", {
+          "argsIgnorePattern": "^_"
+        }]
       },
       "env": {
         "browser": true,

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,8 +2,8 @@
 
 <!-- Your Pull Request name should start with one of the following tags
   [NEW] For new features
-  [IMPROVE] For a improvement (performance or little improvements) in existent features
-  [FIX] For bug fixes that affects the end user
+  [IMPROVE] For an improvement (performance or little improvements) in existing features
+  [FIX] For bug fixes that affect the end-user
   [BREAK] For pull requests including breaking changes
   Chore: For small tasks
   Doc: For documentation

diff --git a/.github/history-manual.json b/.github/history-manual.json
@@ -49,5 +49,35 @@
 		"contributors": [
 			"sampaiodiego"
 		]
+	}],
+	"3.10.5": [{
+		"title": "[FIX] Security Hotfix",
+		"userLogin": "sampaiodiego",
+		"contributors": [
+			"sampaiodiego"
+		]
+	}],
+	"3.12.0-rc.3": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "sampaiodiego",
+		"contributors": [
+			"sampaiodiego"
+		]
+	}],
+	"3.12.2": [{
+		"title": "[FIX] Bump Livechat widget",
+		"userLogin": "sampaiodiego",
+		"contributors": [
+			"sampaiodiego"
+		]
+	}, {
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "sampaiodiego",
+		"contributors": [
+			"sampaiodiego",
+			"g-thome",
+			"KevLehman",
+			"matheusbsilva137"
+		]
 	}]
 }