Merge branch 'dev_devops' into dev_sync_project_educoder
This commit is contained in:
commit
2eca095608
|
@ -3,4 +3,4 @@ json.name user.real_name
|
||||||
json.login user.login
|
json.login user.login
|
||||||
json.image_url url_to_avatar(user)
|
json.image_url url_to_avatar(user)
|
||||||
json.email user.try(:mail)
|
json.email user.try(:mail)
|
||||||
json.token get_user_token(user.try(:login),@project.try(:identifier))
|
# json.token get_user_token(user.try(:login),@project.try(:identifier))
|
||||||
|
|
Loading…
Reference in New Issue