Skip to content

Commit

Permalink
Merge branch 'master' into 165854539-test-coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
kbardi committed May 28, 2019
2 parents 74a8c41 + a0e5f89 commit 9ea7756
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 6 deletions.
5 changes: 2 additions & 3 deletions .env.dev
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
NODE_ENV=development
GUNDB_PASS=password
MNEMONIC="drip industry pizza deny pistol stem must device citizen crowd offer now"
MNEMONIC="myth like bonus scare over problem client lizard pioneer submit female collect"
INFURA_API=
NETWORK=develop
LOG_LEVEL=trace
Expand All @@ -10,11 +10,10 @@ PLIVO_PHONE_NUMBER=1555555555
OTP_DIGITS=6
OTP_TTL_MINUTES=5
WALLET_URL=http://localhost:3000
FACE_RECO_SERVER=https://good-face-reco.herokuapp.com
MAUTIC_URL=https://go.gooddollar.org
MAUTIC_TOKEN=""
ZOOM_API_URL=https://api.zoomauth.com/api/v1/biometrics
ZOOM_TOKEN=
ZOOM_MIN_MATCH_LEVEL=1
ALLOW_DUPLICATE_USER_DATA=true
SKIP_EMAIL_VERIFICATION=true
SKIP_EMAIL_VERIFICATION=true
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ before_script:
- npm i
- truffle migrate --reset --network develop
- npm link
- ls -la releases
- cd ..

script:
Expand Down
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npm start -- --optimize_for_size --max_old_space_size=460
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@gooddollar/goodserver",
"version": "0.0.1",
"version": "0.1.0",
"description": "GoodDollar Server",
"main": "src/server/index.js",
"scripts": {
Expand Down

0 comments on commit 9ea7756

Please sign in to comment.