Merge branch 'develop' into feature/teams

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

.docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.63.1
+ENV RC_VERSION 0.64.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 

.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/issue-templates/release.md

@@ -0,0 +1,59 @@
+# Release {version}
+We are releasing a new version, this issue will keep track of the progress between the first release candidate (20th of each month) to the final release (27th of each month).
+
+After the 20th of each month we start the release process that ends 7 days after, during that period we enter a Feature Freeze. While in the Feature Freeze, we will only be merging bug fixes and not new features.
+
+For any regression, open a new issue and link to this one.
+
+
+## Before Release - Preparation - 1 business day before the day 20th
+- [x] Create the issue to track the release progress
+- [ ] Define the highlights from release PRs as suggestion to be included on Blog Post
+- [ ] Talk to the Marketing Team about the Blog Post release
+- [ ] Talk to the Documentation Team about the Docs release
+- [ ] Sync translations from [LingoHub](https://translate.lingohub.com/rocketchat/rocket-dot-chat/dashboard)
+
+## Release Candidate 1 - On the 20th
+- [ ] Delete branch `release-candidate`
+- [ ] Create branch `release-candidate` based on `develop`
+- [ ] On branch `release-candidate` run `npm run release` and follow the steps
+- [ ] Publish the branch and the generated tag
+- [ ] Edit the tag on GitHub and paste the generated History removing the version from the first line and mark the checkbox **This is a pre-release**
+- [ ] Ensure the build is passing on CircleCI
+- [ ] Ensure the build is passing on Docker Hub
+
+<!-- Copy following block for next release candidates
+## Release Candidate {release-candidate-version}
+- [ ] Merge `develop` into `release-candidate` branch
+- [ ] On branch `release-candidate` run `npm run release` and follow the steps
+- [ ] Publish the branch and the generated tag
+- [ ] Edit the tag on GitHub and paste the generated History removing the version from the first line and mark the checkbox **This is a pre-release**
+- [ ] Ensure the build is passing on CircleCI
+- [ ] Ensure the build is passing on Docker Hub
+-->
+
+## Final Release - On the 27th
+- [ ] Merge `develop` into `release-candidate` branch
+- [ ] Create a new branch `release-{version}` based on `release-candidate`
+- [ ] On branch `release-{version}` run `npm run release` and follow the steps **TODO: fix the history**
+- [ ] Publish only the branch
+- [ ] **Draft a new release** on GitHub
+  - [ ] Enter tag version as {version}
+  - [ ] Select target **master**
+  - [ ] Enter release title as {version}
+  - [ ] Paste the history removing the version from the first line
+  - [ ] Save as **draft**
+- [ ] Create a PR from the branch `release-{version}` with the same history from the tag/release
+- [ ] Ensure the build is passing on CircleCI
+- [ ] Ensure the build is passing on Docker Hub
+- [ ] When build is passing ask for approval
+- [ ] When approved merge it!
+- [ ] When merged edit the release/tag and publish it
+
+## After Release - Conclusion - 1 business day after the 27th
+- [ ] Check if related issues was closed
+- [ ] Check if related issues was assigned to the correct milestone
+- [ ] Check with the Marketing Team about the Blog Post release
+- [ ] Check with the Documentation Team about the Docs release
+- [ ] Create a Sync PR to merge back master to develop
+- [ ] Merge Sync PR

.openshift/rocket-chat-ephemeral.json

@@ -151,7 +151,7 @@
                 "name": "rocketchat"
             },
             "spec": {
-                "dockerImageRepository": "registry.connect.redhat.com/rocketchat/rocketchat",
+                "dockerImageRepository": "${ROCKETCHAT_IMAGE}",
                 "tags": [
                     {
                         "name": "latest",
@@ -241,7 +241,7 @@
                         "containers": [
                             {
                                 "name": "rocketchat",
-                                "image": "registry.connect.redhat.com/rocketchat/rocketchat:latest",
+                                "image": "${ROCKETCHAT_IMAGE}:latest",
                                 "ports": [
                                     {
                                         "containerPort": 3000,
@@ -424,6 +424,13 @@
             "value": "rocketchatdb",
             "required": true
         },
+        {
+            "name": "ROCKETCHAT_IMAGE",
+            "displayName": "RocketChat Image",
+            "description": "The RocketChat image to use for this deployment",
+            "required": true,
+            "value": "rocketchat/rocket.chat"
+        },
         {
             "name": "MONGODB_ADMIN_PASSWORD",
             "displayName": "MongoDB Admin Password",

.openshift/rocket-chat-persistent.json

@@ -171,7 +171,7 @@
                 "name": "rocketchat"
             },
             "spec": {
-                "dockerImageRepository": "registry.connect.redhat.com/rocketchat/rocketchat",
+                "dockerImageRepository": "${ROCKETCHAT_IMAGE}",
                 "tags": [
                     {
                         "name": "latest",
@@ -261,7 +261,7 @@
                         "containers": [
                             {
                                 "name": "rocketchat",
-                                "image": "registry.connect.redhat.com/rocketchat/rocketchat:latest",
+                                "image": "${ROCKETCHAT_IMAGE}:latest",
                                 "ports": [
                                     {
                                         "containerPort": 3000,
@@ -452,6 +452,13 @@
             "from": "[a-zA-Z0-9]{16}",
             "required": true
         },
+        {
+            "name": "ROCKETCHAT_IMAGE",
+            "displayName": "RocketChat Image",
+            "description": "The RocketChat image to use for this deployment",
+            "required": true,
+            "value": "rocketchat/rocket.chat"
+        },
         {
             "name": "VOLUME_CAPACITY",
             "displayName": "Volume Capacity",

.sandstorm/sandstorm-pkgdef.capnp

@@ -21,7 +21,7 @@ const pkgdef :Spk.PackageDefinition = (
 
 		appVersion = 62,  # Increment this for every release.
 
-		appMarketingVersion = (defaultText = "0.63.1"),
+		appMarketingVersion = (defaultText = "0.64.0-develop"),
 		# Human-readable representation of appVersion. Should match the way you
 		# identify versions of your app in documentation and marketing.
 

.snapcraft/snapcraft.yaml

@@ -16,7 +16,7 @@ apps:
     rocketchat-server:
         command: startRocketChat
         daemon: simple
-        plugs: [network, network-bind]
+        plugs: [network, network-bind, desktop]
     rocketchat-mongo:
         command: startmongo
         daemon: simple

.travis/snap.sh

@@ -17,7 +17,7 @@ elif [[ $TRAVIS_TAG ]]; then
     RC_VERSION=$TRAVIS_TAG
 else
     CHANNEL=edge
-    RC_VERSION=0.63.1
+    RC_VERSION=0.64.0-develop
 fi
 
 echo "Preparing to trigger a snap release for $CHANNEL channel"

HISTORY.md

@@ -1,3 +1,8 @@
+<a name="0.64.0-develop"></a>
+# 0.64.0-develop (2018-04-07)
+
+
+
 
 # 0.63.1
 `2018-04-07  ·  5 🐛  ·  3 👩‍💻👨‍💻`

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "0.63.1",
+	"version": "0.64.0-develop",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

packages/rocketchat-api/server/api.js

@@ -28,7 +28,8 @@ class API extends Restivus {
 			roles: 0,
 			statusDefault: 0,
 			_updatedAt: 0,
-			customFields: 0
+			customFields: 0,
+			settings: 0
 		};
 
 		this._config.defaultOptionsEndpoint = function _defaultOptionsEndpoint() {