Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
29448964
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,发现更多精彩内容 >>
提交
29448964
编写于
1月 23, 2018
作者:
O
Oswaldo Ferreira
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Return more consistent values for merge_status on MR API
上级
60f37285
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
1 deletion
+15
-1
changelogs/unreleased/osw-updates-merge-status-on-api-actions.yml
...gs/unreleased/osw-updates-merge-status-on-api-actions.yml
+5
-0
lib/api/entities.rb
lib/api/entities.rb
+8
-1
spec/requests/api/merge_requests_spec.rb
spec/requests/api/merge_requests_spec.rb
+2
-0
未找到文件。
changelogs/unreleased/osw-updates-merge-status-on-api-actions.yml
0 → 100644
浏览文件 @
29448964
---
title
:
Return more consistent values for merge_status on MR APIs
merge_request
:
author
:
type
:
fixed
lib/api/entities.rb
浏览文件 @
29448964
...
@@ -507,7 +507,14 @@ module API
...
@@ -507,7 +507,14 @@ module API
expose
:work_in_progress?
,
as: :work_in_progress
expose
:work_in_progress?
,
as: :work_in_progress
expose
:milestone
,
using:
Entities
::
Milestone
expose
:milestone
,
using:
Entities
::
Milestone
expose
:merge_when_pipeline_succeeds
expose
:merge_when_pipeline_succeeds
expose
:merge_status
# Ideally we should deprecate `MergeRequest#merge_status` exposure and
# use `MergeRequest#mergeable?` instead (boolean).
# See https://gitlab.com/gitlab-org/gitlab-ce/issues/42344 for more
# information.
expose
:merge_status
do
|
merge_request
|
merge_request
.
tap
(
&
:check_if_can_be_merged
).
merge_status
end
expose
:diff_head_sha
,
as: :sha
expose
:diff_head_sha
,
as: :sha
expose
:merge_commit_sha
expose
:merge_commit_sha
expose
:user_notes_count
expose
:user_notes_count
...
...
spec/requests/api/merge_requests_spec.rb
浏览文件 @
29448964
...
@@ -198,6 +198,8 @@ describe API::MergeRequests do
...
@@ -198,6 +198,8 @@ describe API::MergeRequests do
create
(
:merge_request
,
state:
'closed'
,
milestone:
milestone1
,
author:
user
,
assignee:
user
,
source_project:
project
,
target_project:
project
,
title:
"Test"
,
created_at:
base_time
)
create
(
:merge_request
,
state:
'closed'
,
milestone:
milestone1
,
author:
user
,
assignee:
user
,
source_project:
project
,
target_project:
project
,
title:
"Test"
,
created_at:
base_time
)
create
(
:merge_request
,
milestone:
milestone1
,
author:
user
,
assignee:
user
,
source_project:
project
,
target_project:
project
,
title:
"Test"
,
created_at:
base_time
)
expect
do
expect
do
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests"
,
user
)
get
api
(
"/projects/
#{
project
.
id
}
/merge_requests"
,
user
)
end
.
not_to
exceed_query_limit
(
control
)
end
.
not_to
exceed_query_limit
(
control
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录