Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2ad3dcc5
Commit
2ad3dcc5
authored
Aug 25, 2017
by
Mark Fletcher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix invite by email address duplication
parent
19dfd9e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
app/assets/javascripts/users_select.js
app/assets/javascripts/users_select.js
+4
-3
changelogs/unreleased/36937-fix-invite-by-email-text.yml
changelogs/unreleased/36937-fix-invite-by-email-text.yml
+5
-0
No files found.
app/assets/javascripts/users_select.js
View file @
2ad3dcc5
...
...
@@ -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
)
{
...
...
changelogs/unreleased/36937-fix-invite-by-email-text.yml
0 → 100644
View file @
2ad3dcc5
---
title
:
Fix invite by email address duplication
merge_request
:
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment