Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
34e8d972
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,发现更多精彩内容 >>
未验证
提交
34e8d972
编写于
11月 05, 2018
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Expose {closed,merged}_{at,by} in merge requests API index
上级
90473e06
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
93 addition
and
29 deletion
+93
-29
changelogs/unreleased/dm-api-merge-requests-index-merged-at.yml
...logs/unreleased/dm-api-merge-requests-index-merged-at.yml
+5
-0
doc/api/merge_requests.md
doc/api/merge_requests.md
+44
-11
lib/api/entities.rb
lib/api/entities.rb
+16
-16
lib/api/issues.rb
lib/api/issues.rb
+1
-1
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+1
-1
spec/fixtures/api/schemas/public_api/v4/merge_requests.json
spec/fixtures/api/schemas/public_api/v4/merge_requests.json
+26
-0
未找到文件。
changelogs/unreleased/dm-api-merge-requests-index-merged-at.yml
0 → 100644
浏览文件 @
34e8d972
---
title
:
Expose {closed,merged}_{at,by} in merge requests API index
merge_request
:
author
:
type
:
changed
doc/api/merge_requests.md
浏览文件 @
34e8d972
...
...
@@ -57,7 +57,18 @@ Parameters:
"project_id"
:
3
,
"title"
:
"test1"
,
"description"
:
"fixed login page css paddings"
,
"state"
:
"opened"
,
"state"
:
"merged"
,
"merged_by"
:
{
"id"
:
87854
,
"name"
:
"Douwe Maan"
,
"username"
:
"DouweM"
,
"state"
:
"active"
,
"avatar_url"
:
"https://gitlab.example.com/uploads/-/system/user/avatar/87854/avatar.png"
,
"web_url"
:
"https://gitlab.com/DouweM"
},
"merged_at"
:
"2018-09-07T11:16:17.520Z"
,
"closed_by"
:
null
,
"closed_at"
:
null
,
"created_at"
:
"2017-04-29T08:46:00Z"
,
"updated_at"
:
"2017-04-29T08:46:00Z"
,
"target_branch"
:
"master"
,
...
...
@@ -180,7 +191,18 @@ Parameters:
"project_id"
:
3
,
"title"
:
"test1"
,
"description"
:
"fixed login page css paddings"
,
"state"
:
"opened"
,
"state"
:
"merged"
,
"merged_by"
:
{
"id"
:
87854
,
"name"
:
"Douwe Maan"
,
"username"
:
"DouweM"
,
"state"
:
"active"
,
"avatar_url"
:
"https://gitlab.example.com/uploads/-/system/user/avatar/87854/avatar.png"
,
"web_url"
:
"https://gitlab.com/DouweM"
},
"merged_at"
:
"2018-09-07T11:16:17.520Z"
,
"closed_by"
:
null
,
"closed_at"
:
null
,
"created_at"
:
"2017-04-29T08:46:00Z"
,
"updated_at"
:
"2017-04-29T08:46:00Z"
,
"target_branch"
:
"master"
,
...
...
@@ -293,7 +315,18 @@ Parameters:
"project_id"
:
3
,
"title"
:
"test1"
,
"description"
:
"fixed login page css paddings"
,
"state"
:
"opened"
,
"state"
:
"merged"
,
"merged_by"
:
{
"id"
:
87854
,
"name"
:
"Douwe Maan"
,
"username"
:
"DouweM"
,
"state"
:
"active"
,
"avatar_url"
:
"https://gitlab.example.com/uploads/-/system/user/avatar/87854/avatar.png"
,
"web_url"
:
"https://gitlab.com/DouweM"
},
"merged_at"
:
"2018-09-07T11:16:17.520Z"
,
"closed_by"
:
null
,
"closed_at"
:
null
,
"created_at"
:
"2017-04-29T08:46:00Z"
,
"updated_at"
:
"2017-04-29T08:46:00Z"
,
"target_branch"
:
"master"
,
...
...
@@ -383,7 +416,7 @@ Parameters:
"project_id"
:
3
,
"title"
:
"test1"
,
"description"
:
"fixed login page css paddings"
,
"state"
:
"
open
ed"
,
"state"
:
"
merg
ed"
,
"created_at"
:
"2017-04-29T08:46:00Z"
,
"updated_at"
:
"2017-04-29T08:46:00Z"
,
"target_branch"
:
"master"
,
...
...
@@ -695,7 +728,7 @@ POST /projects/:id/merge_requests
"project_id"
:
3
,
"title"
:
"test1"
,
"description"
:
"fixed login page css paddings"
,
"state"
:
"
open
ed"
,
"state"
:
"
merg
ed"
,
"created_at"
:
"2017-04-29T08:46:00Z"
,
"updated_at"
:
"2017-04-29T08:46:00Z"
,
"target_branch"
:
"master"
,
...
...
@@ -822,7 +855,7 @@ Must include at least one non-required attribute from above.
"project_id"
:
3
,
"title"
:
"test1"
,
"description"
:
"fixed login page css paddings"
,
"state"
:
"
open
ed"
,
"state"
:
"
merg
ed"
,
"created_at"
:
"2017-04-29T08:46:00Z"
,
"updated_at"
:
"2017-04-29T08:46:00Z"
,
"target_branch"
:
"master"
,
...
...
@@ -965,7 +998,7 @@ Parameters:
"project_id"
:
3
,
"title"
:
"test1"
,
"description"
:
"fixed login page css paddings"
,
"state"
:
"
open
ed"
,
"state"
:
"
merg
ed"
,
"created_at"
:
"2017-04-29T08:46:00Z"
,
"updated_at"
:
"2017-04-29T08:46:00Z"
,
"target_branch"
:
"master"
,
...
...
@@ -1080,7 +1113,7 @@ Parameters:
"project_id"
:
3
,
"title"
:
"test1"
,
"description"
:
"fixed login page css paddings"
,
"state"
:
"
open
ed"
,
"state"
:
"
merg
ed"
,
"created_at"
:
"2017-04-29T08:46:00Z"
,
"updated_at"
:
"2017-04-29T08:46:00Z"
,
"target_branch"
:
"master"
,
...
...
@@ -1279,7 +1312,7 @@ Example response:
"project_id"
:
3
,
"title"
:
"test1"
,
"description"
:
"fixed login page css paddings"
,
"state"
:
"
open
ed"
,
"state"
:
"
merg
ed"
,
"created_at"
:
"2017-04-29T08:46:00Z"
,
"updated_at"
:
"2017-04-29T08:46:00Z"
,
"target_branch"
:
"master"
,
...
...
@@ -1400,7 +1433,7 @@ Example response:
"project_id"
:
3
,
"title"
:
"test1"
,
"description"
:
"fixed login page css paddings"
,
"state"
:
"
open
ed"
,
"state"
:
"
merg
ed"
,
"created_at"
:
"2017-04-29T08:46:00Z"
,
"updated_at"
:
"2017-04-29T08:46:00Z"
,
"target_branch"
:
"master"
,
...
...
@@ -1540,7 +1573,7 @@ Example response:
"project_id"
:
3
,
"title"
:
"Et voluptas laudantium minus nihil recusandae ut accusamus earum aut non."
,
"description"
:
"Veniam sunt nihil modi earum cumque illum delectus. Nihil ad quis distinctio quia. Autem eligendi at quibusdam repellendus."
,
"state"
:
"
open
ed"
,
"state"
:
"
merg
ed"
,
"created_at"
:
"2016-06-17T07:48:04.330Z"
,
"updated_at"
:
"2016-07-01T11:14:15.537Z"
,
"target_branch"
:
"allow_regex_for_project_skip_ref"
,
...
...
lib/api/entities.rb
浏览文件 @
34e8d972
...
...
@@ -607,6 +607,22 @@ module API
end
class
MergeRequestBasic
<
ProjectEntity
expose
:merged_by
,
using:
Entities
::
UserBasic
do
|
merge_request
,
_options
|
merge_request
.
metrics
&
.
merged_by
end
expose
:merged_at
do
|
merge_request
,
_options
|
merge_request
.
metrics
&
.
merged_at
end
expose
:closed_by
,
using:
Entities
::
UserBasic
do
|
merge_request
,
_options
|
merge_request
.
metrics
&
.
latest_closed_by
end
expose
:closed_at
do
|
merge_request
,
_options
|
merge_request
.
metrics
&
.
latest_closed_at
end
expose
:title_html
,
if:
->
(
_
,
options
)
{
options
[
:render_html
]
}
do
|
entity
|
MarkupHelper
.
markdown_field
(
entity
,
:title
)
end
...
...
@@ -676,22 +692,6 @@ module API
merge_request
.
merge_request_diff
.
real_size
end
expose
:merged_by
,
using:
Entities
::
UserBasic
do
|
merge_request
,
_options
|
merge_request
.
metrics
&
.
merged_by
end
expose
:merged_at
do
|
merge_request
,
_options
|
merge_request
.
metrics
&
.
merged_at
end
expose
:closed_by
,
using:
Entities
::
UserBasic
do
|
merge_request
,
_options
|
merge_request
.
metrics
&
.
latest_closed_by
end
expose
:closed_at
do
|
merge_request
,
_options
|
merge_request
.
metrics
&
.
latest_closed_at
end
expose
:latest_build_started_at
,
if:
->
(
_
,
options
)
{
build_available?
(
options
)
}
do
|
merge_request
,
_options
|
merge_request
.
metrics
&
.
latest_build_started_at
end
...
...
lib/api/issues.rb
浏览文件 @
34e8d972
...
...
@@ -28,7 +28,7 @@ module API
args
[
:scope
]
=
args
[
:scope
].
underscore
if
args
[
:scope
]
issues
=
IssuesFinder
.
new
(
current_user
,
args
).
execute
.
preload
(
:assignees
,
:labels
,
:notes
,
:timelogs
,
:project
,
:author
)
.
preload
(
:assignees
,
:labels
,
:notes
,
:timelogs
,
:project
,
:author
,
:closed_by
)
issues
.
reorder
(
args
[
:order_by
]
=>
args
[
:sort
])
end
...
...
lib/api/merge_requests.rb
浏览文件 @
34e8d972
...
...
@@ -45,7 +45,7 @@ module API
return
merge_requests
if
args
[
:view
]
==
'simple'
merge_requests
.
preload
(
:notes
,
:author
,
:assignee
,
:milestone
,
:latest_merge_request_diff
,
:labels
,
:timelogs
)
.
preload
(
:notes
,
:author
,
:assignee
,
:milestone
,
:latest_merge_request_diff
,
:labels
,
:timelogs
,
metrics:
[
:latest_closed_by
,
:merged_by
]
)
end
# rubocop: enable CodeReuse/ActiveRecord
...
...
spec/fixtures/api/schemas/public_api/v4/merge_requests.json
浏览文件 @
34e8d972
...
...
@@ -9,6 +9,32 @@
"title"
:
{
"type"
:
"string"
},
"description"
:
{
"type"
:
[
"string"
,
"null"
]
},
"state"
:
{
"type"
:
"string"
},
"merged_by"
:
{
"type"
:
[
"object"
,
"null"
],
"properties"
:
{
"name"
:
{
"type"
:
"string"
},
"username"
:
{
"type"
:
"string"
},
"id"
:
{
"type"
:
"integer"
},
"state"
:
{
"type"
:
"string"
},
"avatar_url"
:
{
"type"
:
"uri"
},
"web_url"
:
{
"type"
:
"uri"
}
},
"additionalProperties"
:
false
},
"merged_at"
:
{
"type"
:
[
"date"
,
"null"
]
},
"closed_by"
:
{
"type"
:
[
"object"
,
"null"
],
"properties"
:
{
"name"
:
{
"type"
:
"string"
},
"username"
:
{
"type"
:
"string"
},
"id"
:
{
"type"
:
"integer"
},
"state"
:
{
"type"
:
"string"
},
"avatar_url"
:
{
"type"
:
"uri"
},
"web_url"
:
{
"type"
:
"uri"
}
},
"additionalProperties"
:
false
},
"closed_at"
:
{
"type"
:
[
"date"
,
"null"
]
},
"created_at"
:
{
"type"
:
"date"
},
"updated_at"
:
{
"type"
:
"date"
},
"target_branch"
:
{
"type"
:
"string"
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录