Merge branch 'develop' into trustie_server
This commit is contained in:
commit
81743ce3bc
|
@ -7,5 +7,5 @@ else
|
||||||
json.id nil
|
json.id nil
|
||||||
json.login name
|
json.login name
|
||||||
json.name name
|
json.name name
|
||||||
json.image_url User.get_letter_avatar_url(name)
|
json.image_url User::Avatar.get_letter_avatar_url(name)
|
||||||
end
|
end
|
||||||
|
|
|
@ -26,7 +26,7 @@ else
|
||||||
json.login commit['commit']['author']['name']
|
json.login commit['commit']['author']['name']
|
||||||
json.type nil
|
json.type nil
|
||||||
json.name commit['commit']['author']['name']
|
json.name commit['commit']['author']['name']
|
||||||
json.image_url User.get_letter_avatar_url(commit['commit']['author']['name'])
|
json.image_url User::Avatar.get_letter_avatar_url(commit['commit']['author']['name'])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue