diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-08-25 09:44:03 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-08-25 09:44:03 +0000 |
| commit | ec784b1e5195848e55185831ee024a756f18a9f0 (patch) | |
| tree | e512d89675d5a98244357bac9c41e0cddc2d3bca | |
| parent | 6c372152837874f4fade2b9095cc06ba8e2f2fbd (diff) | |
| parent | 2ad3dcc5ca46905209dadd3b6ad1dcf451ee7fd6 (diff) | |
| download | gitlab-ce-ec784b1e5195848e55185831ee024a756f18a9f0.tar.gz | |
Merge branch '36937-fix-invite-by-email-text' into 'master'
Fix invite by email address duplication
Closes #36937
See merge request !13826
| -rw-r--r-- | app/assets/javascripts/users_select.js | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/36937-fix-invite-by-email-text.yml | 5 |
2 files changed, 9 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) { diff --git a/changelogs/unreleased/36937-fix-invite-by-email-text.yml b/changelogs/unreleased/36937-fix-invite-by-email-text.yml new file mode 100644 index 00000000000..06c6105fab6 --- /dev/null +++ b/changelogs/unreleased/36937-fix-invite-by-email-text.yml @@ -0,0 +1,5 @@ +--- +title: Fix invite by email address duplication +merge_request: +author: +type: fixed |