Merge branch 'develop' into feature/user_info_fix

.circleci/config.yml

@@ -247,6 +247,7 @@ jobs:
             bash .circleci/update-releases.sh
             bash .circleci/docker.sh
             bash .circleci/snap.sh
+            bash .circleci/redhat-registry.sh
 
 workflows:
   version: 2

.circleci/redhat-registry.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -euvo pipefail
+IFS=$'\n\t'
+
+if [[ $CIRCLE_TAG ]]; then
+  curl -X POST \
+  https://connect.redhat.com/api/v2/projects/$REDHAT_REGISTRY_PID/build \
+  -H "Authorization: Bearer $REDHAT_REGISTRY_KEY" \
+  -H 'Cache-Control: no-cache' \
+  -H 'Content-Type: application/json' \
+  -d '{"tag":"'$CIRCLE_TAG'"}'
+fi

.gitignore

@@ -73,3 +73,4 @@ pm2.json
 settings.json
 build.sh
 /public/livechat
+packages/rocketchat-i18n/i18n/livechat.*

client/routes/pageNotFound.html

@@ -0,0 +1,5 @@
+<template name="pageNotFound">
+  <h1>{{_ "Error_404"}}</h1>
+  <h3>{{_ "Oops_page_not_found"}}</h3>
+  <p>{{_ "Sorry_page_you_requested_does_not_exists_or_was_deleted"}}</p>
+</template>

client/routes/router.js

@@ -148,3 +148,10 @@ FlowRouter.route('/register/:hash', {
 		// 	BlazeLayout.render 'logoLayout', { render: 'invalidSecretURL' }
 	}
 });
+
+FlowRouter.notFound = {
+	action() {
+		BlazeLayout.render('pageNotFound');
+	}
+};
+

docker-compose.yml

@@ -28,7 +28,7 @@ services:
     volumes:
      - ./data/db:/data/db
      #- ./data/dump:/dump
-    command: mongod --smallfiles --oplogSize 128 --replSet rs0
+    command: mongod --smallfiles --oplogSize 128 --replSet rs0 --storageEngine=mmapv1
     labels:
       - "traefik.enable=false"