Skip to content

Commit 04c3cac

Browse files
authored
Merge pull request #144 from gnosis/development
Development
2 parents 0b1a415 + 00db234 commit 04c3cac

File tree

97 files changed

+21772
-7677
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+21772
-7677
lines changed

.github/workflows/cla.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2020
with:
2121
path-to-signatures: 'signatures/version1/cla.json'
22-
path-to-cla-document: 'https://github.com/gnosis/contract-proxy-kit/blob/master/GNOSISCLA.md'
22+
path-to-cla-document: 'https://gnosis-safe.io/cla/'
2323
branch: 'cla-signatures'
2424
allowlist: germartinez,mikheevm,rmeissner,Uxio0,dasanra,davidalbela,luarx,giacomolicari,lukasschor,tschubotz,gnosis-info,bot*
2525
empty-commit-flag: false

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jspm_packages/
3939
# TypeScript
4040
typings/
4141
lib
42-
types/truffle-contracts
42+
**/types/truffle-contracts
4343

4444
# Optional npm cache directory
4545
.npm
@@ -67,3 +67,9 @@ build/
6767

6868
# Typechain for migrations
6969
migrations/
70+
71+
# Documentation
72+
docs/
73+
74+
# VSCode
75+
.vscode

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ before_install:
1414

1515
install:
1616
- yarn global add [email protected]
17-
- yarn install
17+
- yarn
1818

1919
jobs:
2020
include:
@@ -24,7 +24,7 @@ jobs:
2424
- ganache-cli -d --defaultBalanceEther 10000 -h 0.0.0.0 --noVMErrorsOnRPCResponse > /dev/null &
2525
- sleep 60
2626
script:
27-
- yarn test
27+
- yarn cpk:test
2828
after_script:
2929
- docker logs $CONTAINER_ID
3030
- docker stop $CONTAINER_ID

GNOSISCLA.md

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)