diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-22 20:37:09 +0000 |
|---|---|---|
| committer | kushalpandya <kushal@gitlab.com> | 2017-06-23 17:24:49 +0530 |
| commit | 72242f6477055fbf4ca6f91f5b0fdaafa1d19966 (patch) | |
| tree | 825096215a190dff156596cd296b0c43c223a394 | |
| parent | 52aff00a7307b83c81cd8c4c47241dacc11a36a9 (diff) | |
| download | gitlab-ce-72242f6477055fbf4ca6f91f5b0fdaafa1d19966.tar.gz | |
Merge branch '33981-add-members-drop-down-doesn-t-separate-name-username' into 'master'
Resolve ""Add Members" drop-down doesn't separate Name/Username"
Closes #33981
See merge request !12376
| -rw-r--r-- | app/assets/javascripts/users_select.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index ec45253e50b..46efdcf4202 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -643,7 +643,7 @@ UsersSelect.prototype.formatResult = function(user) { } else { avatar = gon.default_avatar_url; } - return "<div class='user-result " + (!user.username ? 'no-username' : void 0) + "'> <div class='user-image'><img class='avatar s24' src='" + avatar + "'></div> <div class='user-name'>" + user.name + "</div> <div class='user-username'>" + (user.username || "") + "</div> </div>"; + return "<div class='user-result " + (!user.username ? 'no-username' : void 0) + "'> <div class='user-image'><img class='avatar avatar-inline s32' src='" + avatar + "'></div> <div class='user-name dropdown-menu-user-full-name'>" + user.name + "</div> <div class='user-username dropdown-menu-user-username'>" + ("@" + user.username || "") + "</div> </div>"; }; UsersSelect.prototype.formatSelection = function(user) { |