Update Rocket.Chat to 3.12.1 - last merged state including Smarti

.docker-mongo/Dockerfile

@@ -25,8 +25,9 @@ RUN set -x \
     && mkdir -p /app/uploads \
     && chown rocketchat:rocketchat /app/uploads
 
-ADD . /app
-ADD entrypoint.sh /app/bundle/
+# --chown requires Docker 17.12 and works only on Linux
+ADD --chown=rocketchat:rocketchat . /app
+ADD --chown=rocketchat:rocketchat entrypoint.sh /app/bundle/
 
 RUN aptMark="$(apt-mark showmanual)" \
     && apt-get install -y --no-install-recommends g++ make python ca-certificates \
@@ -42,8 +43,7 @@ RUN aptMark="$(apt-mark showmanual)" \
        | sort -u \
        | xargs -r apt-mark manual \
     && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-    && npm cache clear --force \
-    && chown -R rocketchat:rocketchat /app
+    && npm cache clear --force
 
 VOLUME /app/uploads
 

.docker/Dockerfile

@@ -10,7 +10,8 @@ RUN groupadd -g 65533 -r rocketchat \
     && apt-get update \
     && apt-get install -y --no-install-recommends fontconfig
 
-ADD . /app
+# --chown requires Docker 17.12 and works only on Linux
+ADD --chown=rocketchat:rocketchat . /app
 
 RUN aptMark="$(apt-mark showmanual)" \
     && apt-get install -y --no-install-recommends g++ make python ca-certificates \
@@ -26,8 +27,7 @@ RUN aptMark="$(apt-mark showmanual)" \
        | sort -u \
        | xargs -r apt-mark manual \
     && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-    && npm cache clear --force \
-    && chown -R rocketchat:rocketchat /app
+    && npm cache clear --force
 
 USER rocketchat
 

.docker/Dockerfile.rhel

@@ -1,6 +1,6 @@
-FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
+FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 3.8.2
+ENV RC_VERSION 3.12.1
 
 MAINTAINER [email protected]
 
@@ -13,9 +13,9 @@ LABEL name="Rocket.Chat" \
       description="The Ultimate Open Source Web Chat Platform" \
       run="docker run -d --name ${NAME} ${IMAGE}"
 
-
-# This is ugly... But for some reason npm and node aren't available at this stage.
-ENV PATH /opt/rh/rh-nodejs8/root/usr/bin:/opt/app-root/src/node_modules/.bin/:/opt/app-root/src/.npm-global/bin/:/opt/app-root/src/bin:/opt/app-root/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+USER root
+RUN dnf install -y python38 && rm -rf /var/cache /var/log/dnf* /var/log/yum.*
+USER default
 
 RUN set -x \
  && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104 \
@@ -32,10 +32,6 @@ VOLUME /opt/app-root/src/uploads
 
 WORKDIR /opt/app-root/src/bundle
 
-# Hack needed to force use of bundled library instead of system level outdated library
-# https://github.com/lovell/sharp/issues/892
-ENV LD_PRELOAD=/opt/app-root/src/bundle/programs/server/npm/node_modules/sharp/vendor/lib/libz.so
-
 ENV DEPLOY_METHOD=docker-redhat \
     NODE_ENV=production \
     MONGO_URL=mongodb://mongo:27017/rocketchat \

.eslintignore

@@ -4,11 +4,9 @@ packages/meteor-streams/
 packages/meteor-timesync/
 app/emoji-emojione/generateEmojiIndex.js
 app/favico/favico.js
-app/katex/client/katex/katex.min.js
 packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
 packages/rocketchat-livechat/assets/rocket-livechat.js
 app/theme/client/vendor/
-app/ui/client/lib/Modernizr.js
 public/packages/rocketchat_videobridge/client/public/external_api.js
 packages/tap-i18n/lib/tap_i18next/tap_i18next-1.7.3.js
 private/moment-locales/
@@ -19,3 +17,4 @@ public/workers/**/*
 imports/client/
 !/.storybook/
 ee/server/services/dist/**
+!/.mocharc.js

.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,

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,46 +1,38 @@
 <!-- This is a pull request template, you do not need to uncomment or remove the comments, they won't show up in the PR text. -->
-<!-- Your Pull Request name should start with one of the following tags -->
-<!-- [NEW] For new features -->
-<!-- [FIX] For bug fixes -->
-<!-- [BREAK] For pull requests including breaking changes -->
 
-## Proposed changes
-<!-- Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue below. -->
+<!-- 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
+  [BREAK] For pull requests including breaking changes
+  Chore: For small tasks
+  Doc: For documentation
+-->
+
+<!-- Checklist!!! If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code. 
+  - I have read the Contributing Guide - https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat doc
+  - I have signed the CLA - https://cla-assistant.io/RocketChat/Rocket.Chat
+  - Lint and unit tests pass locally with my changes
+  - I have added tests that prove my fix is effective or that my feature works (if applicable)
+  - I have added necessary documentation (if applicable)
+  - Any dependent changes have been merged and published in downstream modules
+-->
+
+## Proposed changes (including videos or screenshots)
+<!-- CHANGELOG -->
+<!--
+  Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
+  If it fixes a bug or resolves a feature request, be sure to link to that issue below.
+  This description will appear in the release notes if we accept the contribution.
+-->
+
+<!-- END CHANGELOG -->
 
 ## Issue(s)
 <!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->
 
-## How to test or reproduce
+## Steps to test or reproduce
 <!-- Mention how you would reproduce the bug if not mentioned on the issue page already. Also mention which screens are going to have the changes if applicable -->
 
-## Screenshots
-
-## Types of changes
-<!-- What types of changes does your code introduce to Rocket.Chat? -->
-<!-- Put an `x` in the boxes that apply -->
-
-- [ ] Bugfix (non-breaking change which fixes an issue)
-- [ ] Improvement (non-breaking change which improves a current function)
-- [ ] New feature (non-breaking change which adds functionality)
-- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
-- [ ] Hotfix (a major bugfix that has to be merged asap)
-- [ ] Documentation Update (if none of the other choices apply)
-
-## Checklist
-<!-- Put an `x` in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your code. -->
-
-- [ ] I have read the [CONTRIBUTING](https://github.com/RocketChat/Rocket.Chat/blob/develop/.github/CONTRIBUTING.md#contributing-to-rocketchat) doc
-- [ ] I have signed the [CLA](https://cla-assistant.io/RocketChat/Rocket.Chat)
-- [ ] Lint and unit tests pass locally with my changes
-- [ ] I have added tests that prove my fix is effective or that my feature works (if applicable)
-- [ ] I have added necessary documentation (if applicable)
-- [ ] Any dependent changes have been merged and published in downstream modules
-
-## Changelog
-<!-- CHANGELOG -->
-<!-- Enter HERE a brief text that would go up on the changelog on our releases page -->
-<!-- END CHANGELOG -->
-
 ## Further comments
 <!-- If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc... -->
-

.github/history-manual.json

@@ -28,5 +28,40 @@
 		"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"
+		]
+	}],
+	"3.9.1": [{
+		"title": "[FIX] Exception on certain login cases including SAML",
+		"userLogin": "sampaiodiego",
+		"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"
+		]
 	}]
 }