Skip to content

Commit

Permalink
Merge pull request RocketChat#547 from assistify/merge/0.71
Browse files Browse the repository at this point in the history
Merge 0.71
  • Loading branch information
vickyokrm authored Jan 9, 2019
2 parents d942675 + 488dd2c commit 62a827e
Show file tree
Hide file tree
Showing 115 changed files with 2,235 additions and 544 deletions.
8 changes: 6 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ jobs:

- run:
name: Build Rocket.Chat
environment:
TOOL_NODE_FLAGS: --max_old_space_size=4096
command: |
if [[ $CIRCLE_TAG ]]; then meteor reset; fi
set +e
Expand Down Expand Up @@ -139,7 +141,7 @@ jobs:

environment:
TEST_MODE: "true"
MONGO_URL: mongodb://localhost:27017/testwithoplog
MONGO_URL: mongodb://localhost:27017/rocketchat
MONGO_OPLOG_URL: mongodb://localhost:27017/local
RETRY_TESTS: 5

Expand Down Expand Up @@ -200,9 +202,11 @@ jobs:
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 google-chrome-stable
sudo apt-get install -y mongodb-org-shell google-chrome-stable
- run:
name: NPM install
Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7

ENV RC_VERSION 0.70.4
ENV RC_VERSION 0.71.1

MAINTAINER buildmaster@rocket.chat

Expand Down
3 changes: 2 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"extends": ["@rocket.chat/eslint-config"],
"parser": "babel-eslint",
"globals": {
"__meteor_runtime_config__" : false,
"AccountBox" : false,
Expand Down Expand Up @@ -30,7 +31,7 @@
"LivechatDepartment" : false,
"LivechatDepartmentAgents" : false,
"livechatManagerRoutes" : true,
"LivechatMonitoring" : false,
"LivechatMonitoring" : false,
"LivechatPageVisited" : false,
"LivechatTrigger" : false,
"Logger" : false,
Expand Down
Loading

0 comments on commit 62a827e

Please sign in to comment.