summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/users_select.js.coffee
diff options
context:
space:
mode:
authorJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-03-24 18:29:35 -0400
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-03-25 09:54:05 -0400
commit53a831124e4e704cc494511ed4d04969a223db4e (patch)
treefc6700e56fa60052d03425a20502d0f9e416d6c6 /app/assets/javascripts/users_select.js.coffee
parent6835f19c2b173e8fe3b81d43ef24b0b35350c59a (diff)
downloadgitlab-ce-53a831124e4e704cc494511ed4d04969a223db4e.tar.gz
Edit button leaves modal open
Add user avatar to user selection
Diffstat (limited to 'app/assets/javascripts/users_select.js.coffee')
-rw-r--r--app/assets/javascripts/users_select.js.coffee4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee
index a12e6d60e90..59dac4efa65 100644
--- a/app/assets/javascripts/users_select.js.coffee
+++ b/app/assets/javascripts/users_select.js.coffee
@@ -45,7 +45,7 @@ class @UsersSelect
user =
name: data.assignee.name
username: data.assignee.username
- avatar: data.assignee.avatar.url
+ avatar: data.assignee.avatar_url
else
user =
name: 'Unassigned'
@@ -129,7 +129,7 @@ class @UsersSelect
inputId: 'issue_assignee_id'
- hidden: ->
+ hidden: (e) ->
$selectbox.hide()
$value.show()