Merge branch 'develop' into dont-ask-me-again

Author: engelgabriel

.circleci/config.yml

@@ -152,10 +152,12 @@ jobs:
       - run:
           name: Install dependencies
           command: |
+            wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
             sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
+            echo "deb [ arch=amd64 ] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google.list
             echo "deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list
             sudo apt-get update
-            sudo apt-get install -y mongodb-org-shell
+            sudo apt-get install -y mongodb-org-shell google-chrome-stable
 
       - run:
           name: Configure Replica Set
@@ -192,6 +194,14 @@ jobs:
 
       - checkout
 
+      - run:
+          name: Install dependencies
+          command: |
+            wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+            echo "deb [ arch=amd64 ] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google.list
+            sudo apt-get update
+            sudo apt-get install -y google-chrome-stable
+
       - run:
           name: NPM install
           command: |
@@ -245,10 +255,60 @@ jobs:
             aws s3 cp $ROCKET_DEPLOY_DIR/ s3://download.rocket.chat/build/ --recursive
 
             bash .circleci/update-releases.sh
-            bash .circleci/docker.sh
             bash .circleci/snap.sh
             bash .circleci/redhat-registry.sh
 
+  image-build:
+    <<: *defaults
+
+    docker:
+      - image: docker:17.05.0-ce-git
+
+    steps:
+      - attach_workspace:
+          at: /tmp
+
+      - checkout
+
+      - setup_remote_docker
+
+      - run:
+          name: Build Docker image
+          command: |
+            cd /tmp/build
+            cp ~/repo/.docker/Dockerfile .
+            tar xzf Rocket.Chat.tar.gz
+            rm Rocket.Chat.tar.gz
+
+            export CIRCLE_TAG=${CIRCLE_TAG:=}
+            export CIRCLE_PR_NUMBER="${CIRCLE_PR_NUMBER:-${CIRCLE_PULL_REQUEST##*/}}"
+
+            docker login -u $DOCKER_USER -p $DOCKER_PASS
+
+            if [[ $CIRCLE_TAG ]]; then
+              docker build -t rocketchat/rocket.chat:latest .
+              docker push rocketchat/rocket.chat:latest
+
+              docker tag rocketchat/rocket.chat:latest rocketchat/rocket.chat:$CIRCLE_TAG
+              docker push rocketchat/rocket.chat:$CIRCLE_TAG
+
+              exit 0
+            fi;
+
+            if [[ $CIRCLE_PR_NUMBER ]]; then
+              docker build -t rocketchat/rocket.chat:pr-$CIRCLE_PR_NUMBER .
+              docker push rocketchat/rocket.chat:pr-$CIRCLE_PR_NUMBER
+
+              exit 0
+            fi;
+
+            if [[ $CIRCLE_BRANCH == 'develop' ]]; then
+              docker build -t rocketchat/rocket.chat:develop .
+              docker push rocketchat/rocket.chat:develop
+
+              exit 0
+            fi;
+
 workflows:
   version: 2
   build-and-test:
@@ -278,4 +338,29 @@ workflows:
               only: develop
             tags:
               only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
+      - image-build:
+          requires:
+            - deploy
+          filters:
+            branches:
+              only: develop
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
+      - hold:
+          type: approval
+          requires:
+            - build
+          filters:
+            branches:
+              ignore: develop
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
+      - pr-image-build:
+          requires:
+            - hold
+          filters:
+            branches:
+              ignore: develop
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+(-rc\.[0-9]+)?$/
 

.circleci/setartname.sh

@@ -15,7 +15,7 @@ elif [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
 else
   SNAP_CHANNEL=edge
   RC_RELEASE=develop
-  RC_VERSION=0.60.0-develop
+  RC_VERSION=0.66.0-develop
 fi
 
 export SNAP_CHANNEL

.docker/Dockerfile

@@ -1,16 +1,10 @@
 FROM rocketchat/base:8
 
-ENV RC_VERSION 0.66.0-develop
+ADD . /app
 
 MAINTAINER buildmaster@rocket.chat
 
 RUN set -x \
- && 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 \
- && mkdir -p /app \
- && tar -zxf rocket.chat.tgz -C /app \
- && rm rocket.chat.tgz rocket.chat.tgz.asc \
  && cd /app/bundle/programs/server \
  && npm install \
  && npm cache clear --force \

.eslintignore

@@ -15,6 +15,7 @@ packages/rocketchat-ui/client/lib/recorderjs/recorder.js
 packages/rocketchat-ui/client/lib/textarea-autogrow.js
 packages/rocketchat-videobridge/client/public/external_api.js
 packages/rocketchat-theme/client/vendor/
+packages/tap-i18n/lib/tap_i18next/tap_i18next-1.7.3.js
 private/moment-locales/
 public/livechat/
 public/mp3-realtime-worker.js

.github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/bug_report.md

@@ -1,3 +1,9 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
 <!-- 
 
 Please see our guide for opening issues: https://rocket.chat/docs/contributing/reporting-issues
@@ -10,22 +16,12 @@ If you are experiencing a bug please search our issues to be sure it is not alre
 
 ### Description:
 
-<!-- Description of the issue -->
-
-### Server Setup Information:
-
-* Version of Rocket.Chat Server: 
-* Operating System: 
-* Deployment Method(snap/docker/tar/etc): 
-* Number of Running Instances: 
-* DB Replicaset Oplog: 
-* Node Version: 
-* mongoDB Version: 
+<!-- A clear and concise description of what the bug is. -->
 
-### Steps to Reproduce:
+### Steps to reproduce:
 
-1. <!-- First Step -->
-2. <!-- Second Step -->
+1. <!-- Go to '...' -->
+2. <!-- Click on '....' -->
 3. <!-- and so on... -->
 
 ### Expected behavior:
@@ -34,8 +30,23 @@ If you are experiencing a bug please search our issues to be sure it is not alre
 
 ### Actual behavior:
 
-<!-- What actually happens -->
+<!-- What actually happens with SCREENSHOT, if applicable -->
+
+### Server Setup Information:
+
+- Version of Rocket.Chat Server: 
+- Operating System: 
+- Deployment Method: <!-- snap/docker/tar/etc -->
+- Number of Running Instances: 
+- DB Replicaset Oplog: 
+- NodeJS Version: 
+- MongoDB Version: 
+
+### Additional context
+
+<!-- Add any other context about the problem here. -->
 
 ### Relevant logs:
-<!-- Logs from both server and browser -->
+
+<!-- Logs from both SERVER and BROWSER -->
 <!-- For more information about collecting logs please see: https://rocket.chat/docs/contributing/reporting-issues#gathering-logs -->

.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,7 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+
+---
+
+

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/issue-templates/release.md .github/ISSUE_TEMPLATE/release.md

@@ -1,3 +1,9 @@
+---
+name: Release
+about: Internal release checklist template
+
+---
+
 # 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).
 

.github/history.json

@@ -14697,5 +14697,53 @@
         "geekgonecrazy"
       ]
     }
+  ],
+  "0.65.1": [
+    {
+      "pr": "10940",
+      "title": "[FIX] Livechat not loading",
+      "userLogin": "sampaiodiego",
+      "milestone": "0.65.1",
+      "contributors": [
+        "sampaiodiego",
+        "rodrigok"
+      ]
+    },
+    {
+      "pr": "10934",
+      "title": "[FIX] Application crashing on startup when trying to log errors to `exceptions` channel",
+      "userLogin": "sampaiodiego",
+      "milestone": "0.65.1",
+      "contributors": [
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "10928",
+      "title": "[FIX] Incomplete email notification link",
+      "userLogin": "sampaiodiego",
+      "milestone": "0.65.1",
+      "contributors": [
+        "sampaiodiego"
+      ]
+    },
+    {
+      "pr": "10904",
+      "title": "[FIX] Image lazy load was breaking attachments",
+      "userLogin": "ggazzo",
+      "milestone": "0.65.1",
+      "contributors": [
+        "ggazzo"
+      ]
+    },
+    {
+      "pr": "10851",
+      "title": "[FIX] Leave room wasn't working as expected",
+      "userLogin": "ggazzo",
+      "milestone": "0.65.1",
+      "contributors": [
+        "ggazzo"
+      ]
+    }
   ]
 }

.meteor/packages

@@ -118,6 +118,7 @@ rocketchat:slashcommands-archive
 rocketchat:slashcommands-asciiarts
 rocketchat:slashcommands-create
 rocketchat:slashcommands-help
+rocketchat:slashcommands-hide
 rocketchat:slashcommands-invite
 rocketchat:slashcommands-invite-all
 rocketchat:slashcommands-join
@@ -191,3 +192,4 @@ rocketchat:version-check
 rocketchat:search
 chatpal:search
 rocketchat:lazy-load
+tap:i18n

.meteor/versions

@@ -17,7 +17,7 @@ blaze@2.3.2
 blaze-html-templates@1.1.2
 blaze-tools@1.0.10
 boilerplate-generator@1.4.0
-caching-compiler@1.1.11
+caching-compiler@1.1.12
 caching-html-compiler@1.1.2
 callback-hook@1.1.0
 cfs:http-methods@0.0.32
@@ -70,7 +70,7 @@ konecty:change-case@2.3.0
 konecty:delayed-task@1.0.0
 konecty:mongo-counter@0.0.5_3
 konecty:multiple-instances-status@1.1.0
-konecty:user-presence@2.0.1
+konecty:user-presence@2.1.0
 launch-screen@1.1.1
 less@2.7.12
 livedata@1.0.18
@@ -85,7 +85,7 @@ meteorhacks:inject-initial@1.0.4
 meteorhacks:meteorx@1.4.1
 meteorspark:util@0.2.0
 minifier-css@1.3.1
-minifier-js@2.3.4
+minifier-js@2.3.5
 minimongo@1.4.4
 mizzao:autocomplete@0.5.1
 mizzao:timesync@0.3.4
@@ -209,6 +209,7 @@ rocketchat:slashcommands-archive@0.0.1
 rocketchat:slashcommands-asciiarts@0.0.1
 rocketchat:slashcommands-create@0.0.1
 rocketchat:slashcommands-help@0.0.1
+rocketchat:slashcommands-hide@0.0.1
 rocketchat:slashcommands-invite@0.0.1
 rocketchat:slashcommands-invite-all@0.0.1
 rocketchat:slashcommands-join@0.0.1
@@ -246,7 +247,7 @@ rocketchat:videobridge@0.2.0
 rocketchat:webrtc@0.0.1
 rocketchat:wordpress@0.0.1
 routepolicy@1.0.13
-server-render@0.3.0
+server-render@0.3.1
 service-configuration@1.0.11
 session@1.1.7
 sha@1.0.9
@@ -257,7 +258,7 @@ socket-stream-client@0.1.0
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 srp@1.0.10
-standard-minifier-js@2.3.3
+standard-minifier-js@2.3.4
 steffo:meteor-accounts-saml@0.0.1
 swydo:graphql@0.0.3
 tap:i18n@1.8.2

.sandstorm/build.sh

@@ -5,6 +5,7 @@ set -euvo pipefail
 # Make meteor bundle
 sudo chown vagrant:vagrant /home/vagrant -R
 cd /opt/app
+meteor npm install capnp
 meteor npm install
 meteor build --directory /home/vagrant/