There was a problem fetching the pipeline summary.
Merge branch 'development' into issue/68
Conflicts: gulpfile.babel.js src/libs/app.js src/libs/db/mongoose.js src/server.js
Showing
- gulpfile.babel.js 8 additions, 6 deletionsgulpfile.babel.js
- package.json 1 addition, 0 deletionspackage.json
- src/libs/app.js 11 additions, 2 deletionssrc/libs/app.js
- src/libs/config.js 1 addition, 0 deletionssrc/libs/config.js
- src/libs/db/monet.js 3 additions, 0 deletionssrc/libs/db/monet.js
- src/libs/db/mongoose.js 1 addition, 0 deletionssrc/libs/db/mongoose.js
- src/libs/db/query_exec.js 16 additions, 15 deletionssrc/libs/db/query_exec.js
- src/libs/middlewares/dimensions.js 0 additions, 58 deletionssrc/libs/middlewares/dimensions.js
- src/libs/middlewares/parseParams.js 66 additions, 0 deletionssrc/libs/middlewares/parseParams.js
- src/libs/middlewares/query.js 4 additions, 8 deletionssrc/libs/middlewares/query.js
- src/libs/middlewares/response.js 2 additions, 4 deletionssrc/libs/middlewares/response.js
- src/libs/routes/api.js 1 addition, 1 deletionsrc/libs/routes/api.js
- src/libs/routes/city.js 11 additions, 7 deletionssrc/libs/routes/city.js
- src/libs/routes/enrollment.js 133 additions, 157 deletionssrc/libs/routes/enrollment.js
- src/libs/routes/region.js 5 additions, 3 deletionssrc/libs/routes/region.js
- src/libs/routes/school.js 10 additions, 12 deletionssrc/libs/routes/school.js
- src/libs/routes/state.js 8 additions, 5 deletionssrc/libs/routes/state.js
- src/server.js 1 addition, 0 deletionssrc/server.js
Loading
Please register or sign in to comment