Merge branch 'master' of gitlab.coko.foundation:xpub/xpub-faraday into cancel-he-invite (0e007229) · Commits · xpub / xpub-faraday · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xpub-faraday
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Container Registry
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

0e007229

Commit 0e007229 authored 7 years ago by

Sebastian

Downloads
- Plain Diff

Merge branch 'master' of gitlab.coko.foundation:xpub/xpub-faraday into cancel-he-invite

parents 81ed4024 56b2eb32

No related branches found

No related tags found

1 merge request!3Cancel he invite

Changes 15

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 3 additions, 1 deletion

.gitignore
Dockerfile 2 additions, 5 deletions

Dockerfile
docker-compose.yml 32 additions, 0 deletions

docker-compose.yml
packages/component-invite/config/test.js 2 additions, 2 deletions

packages/component-invite/config/test.js
packages/component-invite/src/controllers/assignCollectionRole.js 11 additions, 4 deletions

.../component-invite/src/controllers/assignCollectionRole.js
packages/component-invite/src/helpers/helpers.js 1 addition, 0 deletions

packages/component-invite/src/helpers/helpers.js
packages/component-invite/src/routes/postInvite.js 1 addition, 2 deletions

packages/component-invite/src/routes/postInvite.js
packages/component-invite/src/tests/postInvite.test.js 8 additions, 6 deletions

packages/component-invite/src/tests/postInvite.test.js
packages/xpub-faraday/config/default.js 6 additions, 6 deletions

packages/xpub-faraday/config/default.js
packages/xpub-faraday/config/development.js 15 additions, 0 deletions

packages/xpub-faraday/config/development.js
packages/xpub-faraday/config/validations.js 1 addition, 0 deletions

packages/xpub-faraday/config/validations.js
packages/xpub-faraday/package.json 6 additions, 5 deletions

packages/xpub-faraday/package.json
packages/xpub-faraday/scripts/test.sql 2 additions, 0 deletions

packages/xpub-faraday/scripts/test.sql
packages/xpub-faraday/scripts/wait-for-it.sh 178 additions, 0 deletions

packages/xpub-faraday/scripts/wait-for-it.sh
yarn.lock 127 additions, 1046 deletions

yarn.lock

with 395 additions and 1077 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment