Merge pull request #9259 from RocketChat/release-0.60.0

Release 0.60.0
RocketChat · Dec 27, 2017 · 3510fe8 · 3510fe8
2 parents 65e06c2 + 976ab4b
commit 3510fe8
Show file tree

Hide file tree

Showing 748 changed files with 24,030 additions and 9,270 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,29 +163,23 @@ 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@4.6.1
-
       - run:
           name: NPM install
           command: |
             npm install
-            npm install webdriverio@4.8.0
 
       - run:
           name: Run Tests
           command: |
             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:
@@ -198,30 +192,18 @@ jobs:
 
       - checkout
 
-      - run:
-          name: Update NPM
-          command: |
-            sudo npm install -g npm@4.6.1
-
       - run:
           name: NPM install
           command: |
             npm install
-            npm install webdriverio@4.8.0
 
       - run:
           name: Run Tests
           command: |
             for i in $(seq 1 5); do npm test && s=0 && break || s=$? && sleep 1; done; (exit $s)
 
-      # - run:
-      #     name: Build Failed
-      #     when: on_fail
-      #     command: |
-      #       cp -R .screenshots /tmp/screenshots
-
-      # - store_artifacts:
-      #     path: ~/repo/.screenshots
+      - store_artifacts:
+          path: .screenshots/
 
   deploy:
     <<: *defaults

diff --git a/.circleci/setartname.sh b/.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.59.0-develop
+  RC_VERSION=0.60.0-develop
 fi
 
 export SNAP_CHANNEL

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -1,6 +1,6 @@
-FROM rocketchat/base:4
+FROM rocketchat/base:8
 
-ENV RC_VERSION 0.59.4
+ENV RC_VERSION 0.60.0
 
 MAINTAINER buildmaster@rocket.chat
 
@@ -13,7 +13,7 @@ RUN set -x \
  && 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,
@@ -123,6 +122,7 @@
 		"Logger"                      : false,
 		"Match"                       : false,
 		"Meteor"                      : false,
+		"modal"                       : false,
 		"moment"                      : false,
 		"Mongo"                       : false,
 		"Npm"                         : false,
@@ -135,13 +135,11 @@
 		"RocketChatFile"              : false,
 		"RoomHistoryManager"          : false,
 		"RoomManager"                 : false,
-		"s"                           : false,
 		"ServiceConfiguration"        : false,
 		"Session"                     : false,
 		"Settings"                    : false,
 		"SHA256"                      : false,
 		"SideNav"                     : false,
-		"swal"                        : false,
 		"t"                           : false,
 		"TAPi18n"                     : false,
 		"TAPi18next"                  : false,

diff --git a/.meteor/packages b/.meteor/packages
@@ -4,36 +4,38 @@
 # but you can also edit it by hand.
 
 rocketchat:cors
-accounts-facebook@1.2.1
-accounts-github@1.3.0
-accounts-google@1.2.0
-accounts-meteor-developer@1.3.0
-accounts-password@1.4.0
-accounts-twitter@1.3.0
+
+accounts-facebook@1.3.0
+accounts-github@1.4.0
+accounts-google@1.3.0
+accounts-meteor-developer@1.4.0
+accounts-password@1.5.0
+accounts-twitter@1.4.0
 blaze-html-templates
 check@1.2.5
 ddp-rate-limiter@1.0.7
-ecmascript@0.8.3
-ejson@1.0.14
+ddp-common@1.3.0
+dynamic-import@0.2.0
+ecmascript@0.9.0
+ejson@1.1.0
 email@1.2.3
 fastclick@1.0.13
-http@1.2.12
+http@1.3.0
 jquery@1.11.10
-less@2.7.9
-logging@1.1.17
-meteor-base@1.1.0
+logging@1.1.19
+meteor-base@1.2.0
 mobile-experience@1.0.5
-mongo@1.2.2
+mongo@1.3.1
 random@1.0.10
 rate-limit@1.0.8
-reactive-dict@1.1.9
+reactive-dict@1.2.0
 reactive-var@1.0.11
 reload@1.1.11
 service-configuration@1.0.11
 session@1.1.7
-shell-server@0.2.4
+shell-server@0.3.0
 spacebars
-standard-minifier-js@2.1.2
+standard-minifier-js@2.2.0
 tracker@1.1.3
 
 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
@@ -70,6 +74,7 @@ rocketchat:importer-csv
 rocketchat:importer-hipchat
 rocketchat:importer-hipchat-enterprise
 rocketchat:importer-slack
+rocketchat:importer-slack-users
 rocketchat:integrations
 rocketchat:internal-hubot
 rocketchat:irc
@@ -88,11 +93,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 +126,7 @@ rocketchat:spotify
 rocketchat:statistics
 rocketchat:streamer
 rocketchat:theme
+rocketchat:tokenpass
 rocketchat:tooltip
 rocketchat:tutum
 rocketchat:ui
@@ -133,11 +142,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,14 +150,16 @@ 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
-#kenton:accounts-sandstorm
+keepnox:perfect-scrollbar
+kenton:accounts-sandstorm
 mizzao:autocomplete
 mizzao:timesync
 mrt:reactive-store
@@ -166,14 +172,7 @@ percolate:synced-cron
 raix:handlebar-helpers
 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
-dynamic-import@0.1.3
-keepnox:perfect-scrollbar
diff --git a/.meteor/release b/.meteor/release
@@ -1 +1 @@
-METEOR@1.5.2.2
+METEOR@1.6.0.1