Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2ec2a906
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,发现更多精彩内容 >>
提交
2ec2a906
编写于
10月 26, 2018
作者:
H
Heinrich Lee Yu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add group projects API options for including shared and subgroups
上级
08ddb655
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
1 deletion
+39
-1
lib/api/groups.rb
lib/api/groups.rb
+13
-1
spec/requests/api/groups_spec.rb
spec/requests/api/groups_spec.rb
+26
-0
未找到文件。
lib/api/groups.rb
浏览文件 @
2ec2a906
...
...
@@ -60,7 +60,17 @@ module API
def
find_group_projects
(
params
)
group
=
find_group!
(
params
[
:id
])
projects
=
GroupProjectsFinder
.
new
(
group:
group
,
current_user:
current_user
,
params:
project_finder_params
).
execute
options
=
{
only_owned:
!
params
[
:include_shared
],
include_subgroups:
params
[
:include_subgroups
]
}
projects
=
GroupProjectsFinder
.
new
(
group:
group
,
current_user:
current_user
,
params:
project_finder_params
,
options:
options
).
execute
projects
=
projects
.
with_issues_available_for_user
(
current_user
)
if
params
[
:with_issues_enabled
]
projects
=
projects
.
with_merge_requests_enabled
if
params
[
:with_merge_requests_enabled
]
projects
=
reorder_projects
(
projects
)
...
...
@@ -201,6 +211,8 @@ module API
optional
:starred
,
type:
Boolean
,
default:
false
,
desc:
'Limit by starred status'
optional
:with_issues_enabled
,
type:
Boolean
,
default:
false
,
desc:
'Limit by enabled issues feature'
optional
:with_merge_requests_enabled
,
type:
Boolean
,
default:
false
,
desc:
'Limit by enabled merge requests feature'
optional
:include_subgroups
,
type:
Boolean
,
default:
false
,
desc:
'Includes projects in subgroups of this group'
optional
:include_shared
,
type:
Boolean
,
default:
true
,
desc:
'Include projects shared to this group'
use
:pagination
use
:with_custom_attributes
...
...
spec/requests/api/groups_spec.rb
浏览文件 @
2ec2a906
...
...
@@ -502,6 +502,32 @@ describe API::Groups do
expect
(
json_response
.
first
[
'name'
]).
to
eq
(
public_project
.
name
)
end
it
'returns projects excluding shared'
do
create
(
:project_group_link
,
project:
create
(
:project
),
group:
group1
)
create
(
:project_group_link
,
project:
create
(
:project
),
group:
group1
)
create
(
:project_group_link
,
project:
create
(
:project
),
group:
group1
)
get
api
(
"/groups/
#{
group1
.
id
}
/projects"
,
user1
),
include_shared:
false
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
response
).
to
include_pagination_headers
expect
(
json_response
).
to
be_an
(
Array
)
expect
(
json_response
.
length
).
to
eq
(
2
)
end
it
'returns projects including those in subgroups'
do
subgroup
=
create
(
:group
,
parent:
group1
)
create
(
:project
,
group:
subgroup
)
create
(
:project
,
group:
subgroup
)
get
api
(
"/groups/
#{
group1
.
id
}
/projects"
,
user1
),
include_subgroups:
true
expect
(
response
).
to
have_gitlab_http_status
(
200
)
expect
(
response
).
to
include_pagination_headers
expect
(
json_response
).
to
be_an
(
Array
)
expect
(
json_response
.
length
).
to
eq
(
4
)
end
it
"does not return a non existing group"
do
get
api
(
"/groups/1328/projects"
,
user1
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录