Merge branch 'develop' into develop

RocketChat · Dec 4, 2017 · db41279 · db41279
2 parents fb03e5a + 03c2d37
commit db41279
Show file tree

Hide file tree

Showing 546 changed files with 16,392 additions and 5,782 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,18 +6,18 @@ jobs:
   build:
     <<: *defaults
     docker:
-      - image: circleci/node:4.8
+      - image: circleci/node:8
 
     steps:
       - checkout
 
-      - restore_cache:
-          keys:
-            - node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
+      # - restore_cache:
+      #     keys:
+      #       - node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
 
-      - restore_cache:
-          keys:
-            - meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}
+      # - restore_cache:
+      #     keys:
+      #       - meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}
 
       - run:
           name: Install Meteor
@@ -67,17 +67,17 @@ jobs:
           command: |
             meteor npm run testunit
 
-      - restore_cache:
-          keys:
-            - meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}
+      # - restore_cache:
+      #     keys:
+      #       - meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}
 
-      - restore_cache:
-          keys:
-            - livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/.meteor/versions" }}
+      # - restore_cache:
+      #     keys:
+      #       - livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/.meteor/versions" }}
 
-      - restore_cache:
-          keys:
-            - livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/package.json" }}
+      # - restore_cache:
+      #     keys:
+      #       - livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/package.json" }}
 
       - run:
           name: Build Rocket.Chat
@@ -97,30 +97,30 @@ jobs:
             cd /tmp/build-test/bundle/programs/server
             npm install
 
-      - save_cache:
-          key: node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
-          paths:
-            - ./node_modules
+      # - save_cache:
+      #     key: node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "package.json" }}
+      #     paths:
+      #       - ./node_modules
 
-      - save_cache:
-          key: meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}
-          paths:
-            - ./.meteor/local
+      # - save_cache:
+      #     key: meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/versions" }}
+      #     paths:
+      #       - ./.meteor/local
 
-      - save_cache:
-          key: livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/package.json" }}
-          paths:
-            - ./packages/rocketchat-livechat/app/node_modules
+      # - save_cache:
+      #     key: livechat-node-modules-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/package.json" }}
+      #     paths:
+      #       - ./packages/rocketchat-livechat/app/node_modules
 
-      - save_cache:
-          key: livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/.meteor/versions" }}
-          paths:
-            - ./packages/rocketchat-livechat/app/.meteor/local
+      # - save_cache:
+      #     key: livechat-meteor-cache-{{ checksum ".circleci/config.yml" }}-{{ checksum "packages/rocketchat-livechat/app/.meteor/versions" }}
+      #     paths:
+      #       - ./packages/rocketchat-livechat/app/.meteor/local
 
-      - save_cache:
-          key: meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}
-          paths:
-            - ~/.meteor
+      # - save_cache:
+      #     key: meteor-{{ checksum ".circleci/config.yml" }}-{{ checksum ".meteor/release" }}
+      #     paths:
+      #       - ~/.meteor
 
       - persist_to_workspace:
           root: /tmp/
@@ -134,7 +134,7 @@ jobs:
   test-with-oplog:
     <<: *defaults
     docker:
-      - image: circleci/node:4.8-browsers
+      - image: circleci/node:8-browsers
       - image: mongo:3.4
         command: [mongod, --nojournal, --noprealloc, --smallfiles, --replSet=rs0]
 
@@ -163,11 +163,6 @@ jobs:
             mongo --eval 'rs.initiate({_id:"rs0", members: [{"_id":1, "host":"localhost:27017"}]})'
             mongo --eval 'rs.status()'
 
-      - run:
-          name: Update NPM
-          command: |
-            sudo npm install -g npm
-
       - run:
           name: NPM install
           command: |
@@ -179,12 +174,12 @@ jobs:
             for i in $(seq 1 5); do npm test && s=0 && break || s=$? && sleep 1; done; (exit $s)
 
       - store_artifacts:
-          path: ~/repo/.screenshots
+          path: .screenshots/
 
   test-without-oplog:
     <<: *defaults
     docker:
-      - image: circleci/node:4.8-browsers
+      - image: circleci/node:8-browsers
       - image: circleci/mongo:3.4
 
     environment:
@@ -197,11 +192,6 @@ jobs:
 
       - checkout
 
-      - run:
-          name: Update NPM
-          command: |
-            sudo npm install -g npm
-
       - run:
           name: NPM install
           command: |
@@ -283,7 +273,6 @@ workflows:
             branches:
               only:
                 - develop
-                - circle-ci
             tags:
               only:
                 - "/^\\d+\\.\\d+\\.\\d+(-rc\\.\\d+)?$/"
diff --git a/.circleci/setartname.sh b/.circleci/setartname.sh
@@ -1,7 +1,7 @@
 if [[ $CIRCLE_TAG ]]; then
   export ARTIFACT_NAME="$(npm run version --silent)"
 else
-  export ARTIFACT_NAME="$(npm run version --silent).circleci-$CIRCLE_BUILD_NUM"
+  export ARTIFACT_NAME="$(npm run version --silent).$CIRCLE_BUILD_NUM"
 fi
 
 if [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+ ]]; then
@@ -15,7 +15,7 @@ elif [[ $CIRCLE_TAG =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
 else
   SNAP_CHANNEL=edge
   RC_RELEASE=develop
-  RC_VERSION=0.59.0-develop
+  RC_VERSION=0.60.0-develop
 fi
 
 export SNAP_CHANNEL

diff --git a/.circleci/update-releases.sh b/.circleci/update-releases.sh
@@ -2,16 +2,6 @@
 set -euvo pipefail
 IFS=$'\n\t'
 
-if [[ $RC_RELEASE = "develop" ]]; then
-    aws s3api put-object \
-    --acl public-read \
-    --website-redirect-location "https://download.rocket.chat/build/$ARTIFACT_NAME" \
-    --bucket download.rocket.chat \
-    --key "build/rocket.chat-$RC_VERSION.tgz"
-fi
-
-aws s3api put-object \
---acl public-read \
---website-redirect-location "https://download.rocket.chat/build/$ARTIFACT_NAME" \
---bucket download.rocket.chat \
---key "$RC_RELEASE"
+curl -X POST \
+-H "X-Update-Token: ${UPDATE_TOKEN}" \
+https://releases.rocket.chat/update
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -1,19 +1,19 @@
-FROM rocketchat/base:4
+FROM rocketchat/base:8
 
-ENV RC_VERSION 0.59.0-develop
+ENV RC_VERSION 0.60.0-develop
 
 MAINTAINER [email protected]
 
 RUN set -x \
- && curl -SLf "https://download.rocket.chat/build/rocket.chat-${RC_VERSION}.tgz" -o rocket.chat.tgz \
- && curl -SLf "https://download.rocket.chat/build/rocket.chat-${RC_VERSION}.tgz.asc" -o rocket.chat.tgz.asc \
+ && 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 \
+ && npm cache clear --force \
  && chown -R rocketchat:rocketchat /app
 
 USER rocketchat

diff --git a/.eslintrc b/.eslintrc
@@ -3,7 +3,7 @@
 		"sourceType": "module",
 		"ecmaVersion": 2017,
 		"ecmaFeatures": {
-				"experimentalObjectRestSpread" : true,
+				"experimentalObjectRestSpread" : true
 		}
 	},
 	"env": {
@@ -89,7 +89,6 @@
 		"object-shorthand": 2
 	},
 	"globals": {
-		"_"                           : false,
 		"__meteor_runtime_config__"   : false,
 		"AccountBox"                  : false,
 		"Accounts"                    : false,
@@ -135,7 +134,6 @@
 		"RocketChatFile"              : false,
 		"RoomHistoryManager"          : false,
 		"RoomManager"                 : false,
-		"s"                           : false,
 		"ServiceConfiguration"        : false,
 		"Session"                     : false,
 		"Settings"                    : false,

diff --git a/.meteor/packages b/.meteor/packages
@@ -4,36 +4,38 @@
 # but you can also edit it by hand.
 
 rocketchat:cors
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
-[email protected]
+
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
+[email protected]
 blaze-html-templates
 [email protected]
 [email protected]
-[email protected]
-[email protected]
+[email protected]
+[email protected]
+[email protected]
 [email protected]
 [email protected]
-http@1.2.12
+http@1.3.0
 [email protected]
-[email protected].9
-[email protected].17
-meteor-base@1.1.0
+[email protected].11
+[email protected].19
+meteor-base@1.2.0
 [email protected]
-mongo@1.2.2
+mongo@1.3.0
 [email protected]
 [email protected]
-reactive-dict@1.1.9
+reactive-dict@1.2.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-shell-server@0.2.4
+shell-server@0.3.0
 spacebars
-standard-minifier-js@2.1.2
+standard-minifier-js@2.2.0
 [email protected]
 
 rocketchat:2fa
@@ -53,6 +55,7 @@ rocketchat:crowd
 rocketchat:custom-oauth
 rocketchat:custom-sounds
 rocketchat:dolphin
+rocketchat:drupal
 rocketchat:emoji
 rocketchat:emoji-custom
 rocketchat:emoji-emojione
@@ -62,6 +65,7 @@ rocketchat:file
 rocketchat:file-upload
 rocketchat:github-enterprise
 rocketchat:gitlab
+#rocketchat:google-natural-language
 rocketchat:google-vision
 rocketchat:highlight-words
 rocketchat:iframe-login
@@ -88,11 +92,14 @@ rocketchat:mentions-flextab
 rocketchat:message-attachments
 rocketchat:message-mark-as-unread
 rocketchat:message-pin
+rocketchat:message-snippet
 rocketchat:message-star
 rocketchat:migrations
+rocketchat:monitoring
 rocketchat:oauth2-server-config
 rocketchat:oembed
 rocketchat:otr
+rocketchat:postcss
 rocketchat:push-notifications
 rocketchat:reactions
 rocketchat:sandstorm
@@ -118,6 +125,7 @@ rocketchat:spotify
 rocketchat:statistics
 rocketchat:streamer
 rocketchat:theme
+rocketchat:tokenpass
 rocketchat:tooltip
 rocketchat:tutum
 rocketchat:ui
@@ -133,11 +141,6 @@ rocketchat:version
 rocketchat:videobridge
 rocketchat:webrtc
 rocketchat:wordpress
-rocketchat:message-snippet
-#rocketchat:google-natural-language
-rocketchat:drupal
-rocketchat:monitoring
-#rocketchat:chatops
 
 konecty:change-case
 konecty:delayed-task
@@ -146,13 +149,15 @@ konecty:multiple-instances-status
 konecty:nrr
 konecty:user-presence
 
+deepwell:bootstrap-datepicker2
 dispatch:run-as-user
 francocatena:status
 jalik:ufs
 jalik:ufs-gridfs
 jparker:gravatar
 kadira:blaze-layout
 kadira:flow-router
+keepnox:perfect-scrollbar
 #kenton:accounts-sandstorm
 mizzao:autocomplete
 mizzao:timesync
@@ -168,12 +173,6 @@ raix:push
 raix:ui-dropped-event
 smoral:sweetalert
 steffo:meteor-accounts-saml
-tmeasday:crypto-md5
 todda00:friendly-slugs
-underscorestring:underscore.string
 yasaricli:slugify
 yasinuslu:blaze-meta
-deepwell:bootstrap-datepicker2
-rocketchat:postcss
-[email protected]
-keepnox:perfect-scrollbar
diff --git a/.meteor/release b/.meteor/release
@@ -1 +1 @@
-METEOR@1.5.2.2
+METEOR@1.6