Feature/modify profile (!4) · Merge requests · ERP (SIL) / STUDENT · GitLab

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Merged Feature/modify profile

feature/modify-profile into develop

Merged VOGT VICTOR requested to merge feature/modify-profile into develop 3 years ago

Viewing commit ea2d12f6

Show latest version

Files

4

ea2d12f6

Merge branch 'develop' into 'feature/modify-profile' · ea2d12f6

VOGT VICTOR authored 3 years ago

# Conflicts:
#   frontend/src/containers/Profile.container.js
#   frontend/src/containers/SignUp.container.js

backend/models/user.js

+ 4

− 0

@@ -56,6 +56,10 @@ const UserSchema = new mongoose.Schema({
        select: false,
        default: null,
    },
    url_photo: {
        type:String,
        required: false,
    }
});

UserSchema.set('toJSON', {