Merge pull request RocketChat#2 from RocketChat/develop

upstream catchup

.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://rocket.chat.buildmaster@git.launchpad.net/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 buildmaster@rocket.chat
 

.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": []
+	}]
+}