Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
faf95438
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,体验更适合开发者的 AI 搜索 >>
提交
faf95438
编写于
7月 11, 2017
作者:
S
Stan Hu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use view=simple for simplifying merge requests API
上级
e17ac570
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
5 deletion
+5
-5
doc/api/merge_requests.md
doc/api/merge_requests.md
+1
-1
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+3
-3
spec/requests/api/merge_requests_spec.rb
spec/requests/api/merge_requests_spec.rb
+1
-1
未找到文件。
doc/api/merge_requests.md
浏览文件 @
faf95438
...
...
@@ -25,7 +25,7 @@ Parameters:
|
`order_by`
| string | no | Return requests ordered by
`created_at`
or
`updated_at`
fields. Default is
`created_at`
|
|
`sort`
| string | no | Return requests sorted in
`asc`
or
`desc`
order. Default is
`desc`
|
|
`milestone`
| string | no | Return merge requests for a specific milestone |
|
`
simple`
| boolean | no | R
eturns the
`iid`
, URL, title, description, and basic state of merge request |
|
`
view`
| string | no | If
`simple`
, r
eturns the
`iid`
, URL, title, description, and basic state of merge request |
|
`labels`
| string | no | Return merge requests matching a comma separated list of labels |
|
`created_after`
| datetime | no | Return merge requests created after the given time (inclusive) |
|
`created_before`
| datetime | no | Return merge requests created before the given time (inclusive) |
...
...
lib/api/merge_requests.rb
浏览文件 @
faf95438
...
...
@@ -48,7 +48,7 @@ module API
merge_requests
=
paginate
(
merge_requests
)
.
preload
(
:target_project
)
return
merge_requests
if
params
[
:simple
]
return
merge_requests
if
args
[
:view
]
==
'simple'
merge_requests
.
preload
(
:notes
,
:author
,
:assignee
,
:milestone
,
:merge_request_diff
,
:labels
)
...
...
@@ -82,7 +82,7 @@ module API
optional
:labels
,
type:
String
,
desc:
'Comma-separated list of label names'
optional
:created_after
,
type:
DateTime
,
desc:
'Return merge requests created after the specified time'
optional
:created_before
,
type:
DateTime
,
desc:
'Return merge requests created before the specified time'
optional
:
simple
,
type:
Boolean
,
default:
false
,
desc:
'R
eturns the `iid`, URL, title, description, and basic state of merge request'
optional
:
view
,
type:
String
,
values:
%w[simple]
,
desc:
'If simple, r
eturns the `iid`, URL, title, description, and basic state of merge request'
use
:pagination
end
get
":id/merge_requests"
do
...
...
@@ -94,7 +94,7 @@ module API
current_user:
current_user
,
project:
user_project
}
if
params
[
:
simple
]
if
params
[
:
view
]
==
'simple'
options
[
:with
]
=
Entities
::
MergeRequestSimple
else
options
[
:issuable_metadata
]
=
issuable_meta_data
(
merge_requests
,
'MergeRequest'
)
...
...
spec/requests/api/merge_requests_spec.rb
浏览文件 @
faf95438
...
...
@@ -70,7 +70,7 @@ describe API::MergeRequests do
end
it
"returns an array of all merge_requests using simple mode"
do
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests?
simple=tru
e"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests?
view=simpl
e"
,
user
)
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
include_pagination_headers
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录