@@ -614,16 +614,17 @@ class UserProjectManager(BaseManager):
614614class User (GitlabObject ):
615615_url = '/users'
616616shortPrintAttr = 'username'
617- requiredCreateAttrs = ['email' ,'username' ,'name' ,'password' ]
618- optionalCreateAttrs = ['skype' ,'linkedin' ,'twitter' ,'projects_limit' ,
619- 'extern_uid' ,'provider' ,'bio' ,'admin' ,
620- 'can_create_group' ,'website_url' ,'confirm' ,
621- 'external' ]
617+ requiredCreateAttrs = ['email' ,'username' ,'name' ]
618+ optionalCreateAttrs = ['password' ,'reset_password' ,'skype' ,'linkedin' ,
619+ 'twitter' ,'projects_limit' ,'extern_uid' ,
620+ 'provider' ,'bio' ,'admin' ,'can_create_group' ,
621+ 'website_url' ,'confirm' ,'external' ,
622+ 'organization' ,'location' ]
622623requiredUpdateAttrs = ['email' ,'username' ,'name' ]
623624optionalUpdateAttrs = ['password' ,'skype' ,'linkedin' ,'twitter' ,
624625'projects_limit' ,'extern_uid' ,'provider' ,'bio' ,
625626'admin' ,'can_create_group' ,'website_url' ,
626- 'confirm' ,'external' ]
627+ 'confirm' ,'external' , 'organization' , 'location' ]
627628managers = (
628629 ('emails' ,UserEmailManager , [('user_id' ,'id' )]),
629630 ('keys' ,UserKeyManager , [('user_id' ,'id' )]),
