Merge branch 'develop' into dev_trustie_server
This commit is contained in:
commit
b756be1d6a
|
@ -1,6 +1,7 @@
|
||||||
json.id @user.id
|
json.id @user.id
|
||||||
json.login @user.login
|
json.login @user.login
|
||||||
json.name @user.full_name
|
json.name @user.full_name
|
||||||
|
json.location @user.location
|
||||||
json.image_url url_to_avatar(@user)
|
json.image_url url_to_avatar(@user)
|
||||||
json.url "#{request.base_url }/users/#{@user.login}"
|
json.url "#{request.base_url }/users/#{@user.login}"
|
||||||
json.followers_count @user.followers_count
|
json.followers_count @user.followers_count
|
||||||
|
|
Loading…
Reference in New Issue