Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2ad3dcc5
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2ad3dcc5
编写于
8月 25, 2017
作者:
M
Mark Fletcher
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix invite by email address duplication
上级
19dfd9e9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
3 deletion
+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
未找到文件。
app/assets/javascripts/users_select.js
浏览文件 @
2ad3dcc5
...
@@ -588,9 +588,10 @@ function UsersSelect(currentUser, els) {
...
@@ -588,9 +588,10 @@ function UsersSelect(currentUser, els) {
if
(
showEmailUser
&&
data
.
results
.
length
===
0
&&
query
.
term
.
match
(
/^
[^
@
]
+@
[^
@
]
+$/
))
{
if
(
showEmailUser
&&
data
.
results
.
length
===
0
&&
query
.
term
.
match
(
/^
[^
@
]
+@
[^
@
]
+$/
))
{
var
trimmed
=
query
.
term
.
trim
();
var
trimmed
=
query
.
term
.
trim
();
emailUser
=
{
emailUser
=
{
name
:
"
Invite
\"
"
+
query
.
term
+
"
\"
"
,
name
:
"
Invite
\"
"
+
query
.
term
+
"
\"
by email
"
,
username
:
trimmed
,
username
:
trimmed
,
id
:
trimmed
id
:
trimmed
,
invite
:
true
};
};
data
.
results
.
unshift
(
emailUser
);
data
.
results
.
unshift
(
emailUser
);
}
}
...
@@ -642,7 +643,7 @@ UsersSelect.prototype.formatResult = function(user) {
...
@@ -642,7 +643,7 @@ UsersSelect.prototype.formatResult = function(user) {
}
else
{
}
else
{
avatar
=
gon
.
default_avatar_url
;
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
)
{
UsersSelect
.
prototype
.
formatSelection
=
function
(
user
)
{
...
...
changelogs/unreleased/36937-fix-invite-by-email-text.yml
0 → 100644
浏览文件 @
2ad3dcc5
---
title
:
Fix invite by email address duplication
merge_request
:
author
:
type
:
fixed
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录