Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

simcaq-node
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

c5d784d7

There was a problem fetching the pipeline summary.

Commit c5d784d7 authored 7 years ago by Vytor Calixto

:space_invader:

Downloads
- Plain Diff

Merge branch 'development' into workerpool_feature

Conflicts:
	config.json.example
	src/libs/models/user.js
	src/libs/routes/school.js

parents c4f3cb0e 89b3888d

No related branches found

No related tags found

2 merge requests!116Release v1.0.0,!73Workerpool feature

Pipeline #

Changes 8
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

package.json 1 addition, 0 deletions

package.json
src/libs/convert/agreement.js 2 additions, 2 deletions

src/libs/convert/agreement.js
src/libs/middlewares/email.js 0 additions, 37 deletions

src/libs/middlewares/email.js
src/libs/middlewares/id2str.js 0 additions, 21 deletions

src/libs/middlewares/id2str.js
src/libs/models/user.js 0 additions, 4 deletions

src/libs/models/user.js
src/libs/routes/school.js 43 additions, 461 deletions

src/libs/routes/school.js
src/test/schoolCount.js 6 additions, 326 deletions

src/test/schoolCount.js
src/test/user.js 5 additions, 594 deletions

src/test/user.js

with 57 additions and 1445 deletions

Loading

0% Loading 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