Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5bab7895
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,发现更多精彩内容 >>
提交
5bab7895
编写于
7月 27, 2018
作者:
J
Jacopo
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve error message when adding invalid user to a project
上级
87f03f01
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
17 addition
and
1 deletion
+17
-1
changelogs/unreleased/32821-better-error-message-add-invalid-user-to-project.yml
...2821-better-error-message-add-invalid-user-to-project.yml
+5
-0
lib/api/members.rb
lib/api/members.rb
+4
-1
spec/requests/api/members_spec.rb
spec/requests/api/members_spec.rb
+8
-0
未找到文件。
changelogs/unreleased/32821-better-error-message-add-invalid-user-to-project.yml
0 → 100644
浏览文件 @
5bab7895
---
title
:
Improve error message when adding invalid user to a project
merge_request
:
20885
author
:
Jacopo Beschi @jacopo-beschi
type
:
added
lib/api/members.rb
浏览文件 @
5bab7895
...
...
@@ -75,7 +75,10 @@ module API
member
=
source
.
members
.
find_by
(
user_id:
params
[
:user_id
])
conflict!
(
'Member already exists'
)
if
member
member
=
source
.
add_user
(
params
[
:user_id
],
params
[
:access_level
],
current_user:
current_user
,
expires_at:
params
[
:expires_at
])
user
=
User
.
find_by_id
(
params
[
:user_id
])
not_found!
(
'User'
)
unless
user
member
=
source
.
add_user
(
user
,
params
[
:access_level
],
current_user:
current_user
,
expires_at:
params
[
:expires_at
])
if
!
member
not_allowed!
# This currently can only be reached in EE
...
...
spec/requests/api/members_spec.rb
浏览文件 @
5bab7895
...
...
@@ -231,6 +231,14 @@ describe API::Members do
expect
(
response
).
to
have_gitlab_http_status
(
409
)
end
it
'returns 404 when the user_id is not valid'
do
post
api
(
"/
#{
source_type
.
pluralize
}
/
#{
source
.
id
}
/members"
,
maintainer
),
user_id:
0
,
access_level:
Member
::
MAINTAINER
expect
(
response
).
to
have_gitlab_http_status
(
404
)
expect
(
json_response
[
'message'
]).
to
eq
(
'404 User Not Found'
)
end
it
'returns 400 when user_id is not given'
do
post
api
(
"/
#{
source_type
.
pluralize
}
/
#{
source
.
id
}
/members"
,
maintainer
),
access_level:
Member
::
MAINTAINER
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录