diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-08-29 21:09:27 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-08-29 21:09:27 +0800 |
commit | 110d7fb78c0edf2e18c70ff3d9b60671f6935977 (patch) | |
tree | d05720cfd55e3b91e067aaeca5731572e5853e4e /app/assets/javascripts/users_select.js | |
parent | 00b440443808fba04fc55f7e77c61f79e29c21ea (diff) | |
parent | 01785533a5ba26e9dbed7972d9732a9b122ff3e0 (diff) | |
download | gitlab-ce-110d7fb78c0edf2e18c70ff3d9b60671f6935977.tar.gz |
Merge remote-tracking branch 'upstream/master' into perf.slow-issuable
* upstream/master: (206 commits)
Resolve "Monitoring graph date formatting is wrong"
Add styles for shorter code
Update doc for dind using overlay2
Cleans merge_jid when possible on MergeService
Rename MergeRequest#async_merge to merge_async
Add changelog
Track enqueued and ongoing MRs
Remove locked? check when unlocking a merge request
Update CHANGELOG.md for 9.5.2
Update rubocop-gitlab-security to 0.1.0
Fix spec
Fix changelog
Fix spec
Add changelog
Remove trigger_request.trigger.owner
Reproduced bug
Fix a transient failure in mini_pipeline_graph_spec
fix typo
fix spec
Fix events error importing GitLab projects
...
Diffstat (limited to 'app/assets/javascripts/users_select.js')
-rw-r--r-- | app/assets/javascripts/users_select.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index 16ebf5916dc..a31fedee021 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -588,9 +588,10 @@ function UsersSelect(currentUser, els) { if (showEmailUser && data.results.length === 0 && query.term.match(/^[^@]+@[^@]+$/)) { var trimmed = query.term.trim(); emailUser = { - name: "Invite \"" + query.term + "\"", + name: "Invite \"" + query.term + "\" by email", username: trimmed, - id: trimmed + id: trimmed, + invite: true }; data.results.unshift(emailUser); } @@ -642,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 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>"; + 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.invite ? "@" + _.escape(user.username) : "") + "</div> </div>"; }; UsersSelect.prototype.formatSelection = function(user) { |