Skip to content

Commit

Permalink
Merge pull request #14653 from RocketChat/release-1.1.0
Browse files Browse the repository at this point in the history
Release 1.1.0
  • Loading branch information
sampaiodiego committed May 28, 2019
2 parents f19473c + 3a7c871 commit 484ee10
Show file tree
Hide file tree
Showing 1,438 changed files with 30,651 additions and 14,238 deletions.
3 changes: 0 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,6 @@ jobs:
# rm -rf node_modules
# rm -f package-lock.json
meteor npm install
cd packages/rocketchat-livechat/.app
meteor npm install
cd -
- run:
name: Lint
Expand Down
2 changes: 1 addition & 1 deletion .circleci/snap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cd $PWD/.snapcraft
echo -e "Tag: $CIRCLE_TAG\r\nBranch: $CIRCLE_BRANCH\r\nBuild: $CIRCLE_BUILD_NUM\r\nCommit: $CIRCLE_SHA1" > buildinfo

# Clone launchpad repo for the channel down.
git clone -b $SNAP_CHANNEL git+ssh://rocket.chat.buildmaster@git.launchpad.net/rocket.chat launchpad
git clone -b $SNAP_CHANNEL --depth 1 git+ssh://rocket.chat.buildmaster@git.launchpad.net/rocket.chat launchpad

# Rarely will change, but just incase we copy it all
cp -r resources buildinfo snap launchpad/
Expand Down
20 changes: 0 additions & 20 deletions .docker/Dockerfile.local

This file was deleted.

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 1.0.3
ENV RC_VERSION 1.1.0

MAINTAINER buildmaster@rocket.chat

Expand Down
18 changes: 0 additions & 18 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,24 +1,6 @@
{
"extends": ["@rocket.chat/eslint-config"],
"parser": "babel-eslint",
"rules": {
"import/no-unresolved": [2, {
"commonjs": true,
"amd": true,
"ignore": [
"^meteor\/.+$"
]
}],
"import/named": 0,
"import/namespace": 0,
"import/default": 0,
"import/export": 2,
"import/no-cycle": 0,
"import/no-useless-path-segments": 2,
"import/no-duplicates": 2,
"import/no-named-as-default": 0,
"import/no-named-as-default-member": 0
},
"globals": {
"__meteor_bootstrap__" : false,
"__meteor_runtime_config__" : false,
Expand Down
Loading

0 comments on commit 484ee10

Please sign in to comment.