Merge commit 'a9fb4da5c847a456990a5d60369f0f52ff4a8bd8' into fix-rest…

…-api-chat-postmessage-validations

* commit 'a9fb4da5c847a456990a5d60369f0f52ff4a8bd8': (137 commits)
  Remove "secret" from REST endpoint /settings.oauth response
  [FIX] Directory sort and column sizes were wrong (#10403)
  [FIX] Add oauth services missing fields, and indicate whether the oauth service is customized (#10299)
  Show error message when email verification fails (#10446)
  Correct the column positions in the directory search for users (#10454)
  Fixed custom fields misalignment in registration form (#10463)
  [FIX] Unique identifier file not really being unique (#10341)
  [OTHER] More Listeners for Apps & Utilize Promises inside Apps (#10335)
  [FIX] Empty panel after changing a user's username (#10404)
  [FIX] Russian translation of "False" (#10418)
  [FIX] Links being embedded inside of blockquotes (#10496)
  [FIX] The 'channel.messages' REST API Endpoint error (#10485)
  [OTHER] Develop sync (#10487)
  [FIX] Button on user info contextual bar scrolling with the content (#10358)
  [FIX] "Idle Time Limit" using milliseconds instead of seconds (#9824)
  [NEW] Body of the payload on an incoming webhook is included on the request object (#10259)
  [FIX] Missing i18n translation key for "Unread" (#10387)
  [FIX] Owner unable to delete channel or group from APIs (#9729)
  [NEW] REST endpoint to recover forgotten password (#10371)
  Add REST endpoint chat.reportMessage, to report a message (#10354)
  ...

.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     <<: *defaults
     docker:
-      - image: circleci/node:8
+      - image: circleci/node:8.9
 
     steps:
       - checkout
@@ -134,7 +134,7 @@ jobs:
   test-with-oplog:
     <<: *defaults
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.9-browsers
       - image: mongo:3.4
         command: [mongod, --nojournal, --noprealloc, --smallfiles, --replSet=rs0]
 
@@ -179,7 +179,7 @@ jobs:
   test-without-oplog:
     <<: *defaults
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8.9-browsers
       - image: circleci/mongo:3.4
 
     environment:
@@ -208,7 +208,7 @@ jobs:
   deploy:
     <<: *defaults
     docker:
-      - image: circleci/node:4.8
+      - image: circleci/node:8.9
 
     steps:
       - attach_workspace:
@@ -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

.circleci/snap.sh

@@ -18,6 +18,7 @@ git clone -b $SNAP_CHANNEL git+ssh://[email protected]/r
 # Rarely will change, but just incase we copy it all
 cp -r resources buildinfo launchpad/
 sed s/#{RC_VERSION}/$RC_VERSION/ snapcraft.yaml > launchpad/snapcraft.yaml
+sed s/#{RC_VERSION}/$RC_VERSION/ resources/prepareRocketChat > launchpad/resources/prepareRocketChat
 
 cd launchpad
 git add resources snapcraft.yaml buildinfo

.docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.63.0-develop
+ENV RC_VERSION 0.64.0-develop
 
 MAINTAINER [email protected]
 

.docker/Dockerfile.rhel

@@ -0,0 +1,44 @@
+FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
+
+ENV RC_VERSION 0.63.2
+
+MAINTAINER [email protected]
+
+LABEL name="Rocket.Chat" \
+      vendor="Rocket.Chat" \
+      version="${RC_VERSION}" \
+      release="1" \
+      url="https://rocket.chat" \
+      summary="The Ultimate Open Source Web Chat Platform" \
+      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
+
+RUN set -x \
+ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104 \
+ && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/download" -o rocket.chat.tgz \
+ && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
+ && gpg --verify rocket.chat.tgz.asc \
+ && tar -zxf rocket.chat.tgz -C /opt/app-root/src/ \
+ && cd /opt/app-root/src/bundle/programs/server \
+ && npm install
+
+COPY licenses /licenses
+
+VOLUME /opt/app-root/src/uploads
+
+WORKDIR /opt/app-root/src/bundle
+
+ENV DEPLOY_METHOD=docker-redhat \
+    NODE_ENV=production \
+    MONGO_URL=mongodb://mongo:27017/rocketchat \
+    HOME=/tmp \
+    PORT=3000 \
+    ROOT_URL=http://localhost:3000
+
+EXPOSE 3000
+
+CMD ["node", "main.js"]

.docker/licenses/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2017 Rocket.Chat Technologies Corp.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+

.eslintignore

@@ -20,3 +20,4 @@ private/moment-locales/
 public/livechat/
 public/mp3-realtime-worker.js
 public/lame.min.js
+!.scripts

.eslintrc

@@ -132,6 +132,7 @@
 		"Promise"                     : false,
 		"Random"                      : false,
 		"ReactiveVar"                 : false,
+		"Reload"                      : false,
 		"RocketChat"                  : true,
 		"RocketChatFile"              : false,
 		"RoomHistoryManager"          : false,

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,9 +3,6 @@
 <!-- [FIX] For bug fixes -->
 <!-- [BREAK] For pull requests including breaking changes -->
 
-<!-- INSTRUCTION: Keep the line below to notify all core developers about this new PR -->
-@RocketChat/core 
-
 <!-- INSTRUCTION: Inform the issue number that this PR closes, or remove the line below -->
 Closes #ISSUE_NUMBER
 

.github/bot-config.yml

@@ -6,9 +6,14 @@ whitelist:
     - theorenck
     - JSzaszvari
   labels:
+    - "Contributions: welcome"
+    - "Contributions: only core team"
+    - "Feature: Request"
+    - "Feature: Planned"
+    - "type: bug"
+    - "help wanted"    
     - duplicate
     - enhancement
-    - "help wanted"
     - invalid
     - question
     - wontfix

.github/history-manual.json

@@ -0,0 +1,15 @@
+{
+	"0.55.0": [{
+		"title": "[BREAK] `getUsersOfRoom` API to return array of objects with user and username, instead of array of strings",
+		"userLogin": "rodrigok",
+		"contributors": []
+	}, {
+		"title": "[FIX] Incoming integrations would break when trying to use the `Store` feature.`",
+		"userLogin": "rodrigok",
+		"contributors": []
+	}, {
+		"title": "[FIX] Removed Deprecated Package rocketchat:sharedsecret`",
+		"userLogin": "rodrigok",
+		"contributors": []
+	}]
+}