Skip to content

Commit

Permalink
Merge pull request #144 from gnosis/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
germartinez authored Feb 22, 2021
2 parents 0b1a415 + 00db234 commit 04c3cac
Show file tree
Hide file tree
Showing 97 changed files with 21,772 additions and 7,677 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
path-to-signatures: 'signatures/version1/cla.json'
path-to-cla-document: 'https://github.com/gnosis/contract-proxy-kit/blob/master/GNOSISCLA.md'
path-to-cla-document: 'https://gnosis-safe.io/cla/'
branch: 'cla-signatures'
allowlist: germartinez,mikheevm,rmeissner,Uxio0,dasanra,davidalbela,luarx,giacomolicari,lukasschor,tschubotz,gnosis-info,bot*
empty-commit-flag: false
Expand Down
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jspm_packages/
# TypeScript
typings/
lib
types/truffle-contracts
**/types/truffle-contracts

# Optional npm cache directory
.npm
Expand Down Expand Up @@ -67,3 +67,9 @@ build/

# Typechain for migrations
migrations/

# Documentation
docs/

# VSCode
.vscode
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ before_install:

install:
- yarn global add [email protected]
- yarn install
- yarn

jobs:
include:
Expand All @@ -24,7 +24,7 @@ jobs:
- ganache-cli -d --defaultBalanceEther 10000 -h 0.0.0.0 --noVMErrorsOnRPCResponse > /dev/null &
- sleep 60
script:
- yarn test
- yarn cpk:test
after_script:
- docker logs $CONTAINER_ID
- docker stop $CONTAINER_ID
Expand Down
33 changes: 0 additions & 33 deletions GNOSISCLA.md

This file was deleted.

Loading

0 comments on commit 04c3cac

Please sign in to comment.