Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

gdd-sigma-poc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

f6059ad7

Commit f6059ad7 authored 6 years ago by Quentin CHEVALIER

Downloads
- Plain Diff

Merge branch 'LDAP_changes' of gitlab.binets.fr:br/sigma-backend into LDAP_changes

parents 63b4ed9e 980c1761

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/config_passport.js 1 addition, 1 deletion

src/config_passport.js
src/graphql/models/tools.ts 7 additions, 3 deletions

src/graphql/models/tools.ts
src/graphql/models/userModel.ts 11 additions, 17 deletions

src/graphql/models/userModel.ts
src/graphql/object_resolvers/users.ts 12 additions, 14 deletions

src/graphql/object_resolvers/users.ts
src/graphql/typeDefs/actions.graphql 1 addition, 4 deletions

src/graphql/typeDefs/actions.graphql
src/graphql/typeDefs/queries.d.ts 1 addition, 4 deletions

src/graphql/typeDefs/queries.d.ts
src/ldap/export/user.ts 2 additions, 0 deletions

src/ldap/export/user.ts
src/ldap/internal/config.ts 2 additions, 2 deletions

src/ldap/internal/config.ts
src/ldap/internal/tools.ts 5 additions, 4 deletions

src/ldap/internal/tools.ts

with 42 additions and 49 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