diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee index c1fa16ca89c642947728167c699c5756da1a2fec..ce9a505b1e3a62b203c81dffe9d7289aa0585a75 100644 --- a/app/assets/javascripts/users_select.js.coffee +++ b/app/assets/javascripts/users_select.js.coffee @@ -1,7 +1,7 @@ $ -> userFormatResult = (user) -> - if user.avatar - avatar = user.avatar.url + if user.avatar_url + avatar = user.avatar_url else if gon.gravatar_enabled avatar = gon.gravatar_url avatar = avatar.replace('%{hash}', md5(user.email)) diff --git a/app/assets/stylesheets/generic/selects.scss b/app/assets/stylesheets/generic/selects.scss index c506bff8a74dffb752be705d549e04b92c39b12a..a257049bacf7d1786af91a5f639b14007216185a 100644 --- a/app/assets/stylesheets/generic/selects.scss +++ b/app/assets/stylesheets/generic/selects.scss @@ -78,3 +78,7 @@ select { .project-refs-form .select2-container { margin-right: 10px; } + +.ajax-users-dropdown .select2-search { + padding-top: 4px; +} diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 8f54d0d4d841d51b841a17b430aba5c12660e541..8557fa074d470846e8ca2ba90a2d1e4b790e028c 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -6,6 +6,12 @@ module API expose :is_admin?, as: :is_admin expose :can_create_group?, as: :can_create_group expose :can_create_project?, as: :can_create_project + + expose :avatar_url do |user, options| + if user.avatar.present? + user.avatar.url + end + end end class UserSafe < Grape::Entity