Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
fb2fde9d
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 搜索 >>
提交
fb2fde9d
编写于
4月 08, 2016
作者:
R
Robert Schilling
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
API: Expose subscribed? on issues
上级
b30ebdaa
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
46 addition
and
25 deletion
+46
-25
CHANGELOG
CHANGELOG
+1
-0
doc/api/issues.md
doc/api/issues.md
+11
-6
doc/api/merge_requests.md
doc/api/merge_requests.md
+13
-6
lib/api/entities.rb
lib/api/entities.rb
+8
-0
lib/api/issues.rb
lib/api/issues.rb
+5
-5
lib/api/merge_requests.rb
lib/api/merge_requests.rb
+7
-7
lib/api/milestones.rb
lib/api/milestones.rb
+1
-1
未找到文件。
CHANGELOG
浏览文件 @
fb2fde9d
...
...
@@ -12,6 +12,7 @@ v 8.7.0 (unreleased)
- Allow back dating on issues when created through the API
- Fix Error 500 after renaming a project path (Stan Hu)
- Fix avatar stretching by providing a cropping feature
- API: Expose `subscribed` for issues and merge requests (Robert Schilling)
- Allow SAML to handle external users based on user's information !3530
- Add endpoints to archive or unarchive a project !3372
- Add links to CI setup documentation from project settings and builds pages
...
...
doc/api/issues.md
浏览文件 @
fb2fde9d
...
...
@@ -76,8 +76,9 @@ Example response:
"title"
:
"Consequatur vero maxime deserunt laboriosam est voluptas dolorem."
,
"created_at"
:
"2016-01-04T15:31:51.081Z"
,
"iid"
:
6
,
"labels"
:
[]
},
"labels"
:
[],
"subscribed"
:
false
}
]
```
...
...
@@ -152,7 +153,8 @@ Example response:
"id"
:
41
,
"title"
:
"Ut commodi ullam eos dolores perferendis nihil sunt."
,
"updated_at"
:
"2016-01-04T15:31:46.176Z"
,
"created_at"
:
"2016-01-04T15:31:46.176Z"
"created_at"
:
"2016-01-04T15:31:46.176Z"
,
"subscribed"
:
false
}
]
```
...
...
@@ -213,7 +215,8 @@ Example response:
"id"
:
41
,
"title"
:
"Ut commodi ullam eos dolores perferendis nihil sunt."
,
"updated_at"
:
"2016-01-04T15:31:46.176Z"
,
"created_at"
:
"2016-01-04T15:31:46.176Z"
"created_at"
:
"2016-01-04T15:31:46.176Z"
,
"subscribed"
:
false
}
```
...
...
@@ -267,7 +270,8 @@ Example response:
},
"description"
:
null
,
"updated_at"
:
"2016-01-07T12:44:33.959Z"
,
"milestone"
:
null
"milestone"
:
null
,
"subscribed"
:
true
}
```
...
...
@@ -323,7 +327,8 @@ Example response:
],
"id"
:
85
,
"assignee"
:
null
,
"milestone"
:
null
"milestone"
:
null
,
"subscribed"
:
true
}
```
...
...
doc/api/merge_requests.md
浏览文件 @
fb2fde9d
...
...
@@ -66,7 +66,8 @@ Parameters:
"due_date"
:
null
},
"merge_when_build_succeeds"
:
true
,
"merge_status"
:
"can_be_merged"
"merge_status"
:
"can_be_merged"
,
"subscribed"
:
false
}
]
```
...
...
@@ -128,7 +129,8 @@ Parameters:
"due_date"
:
null
},
"merge_when_build_succeeds"
:
true
,
"merge_status"
:
"can_be_merged"
"merge_status"
:
"can_be_merged"
,
"subscribed"
:
true
}
```
...
...
@@ -227,6 +229,7 @@ Parameters:
},
"merge_when_build_succeeds"
:
true
,
"merge_status"
:
"can_be_merged"
,
"subscribed"
:
true
,
"changes"
:
[
{
"old_path"
:
"VERSION"
,
...
...
@@ -304,7 +307,8 @@ Parameters:
"due_date"
:
null
},
"merge_when_build_succeeds"
:
true
,
"merge_status"
:
"can_be_merged"
"merge_status"
:
"can_be_merged"
,
"subscribed"
:
true
}
```
...
...
@@ -373,7 +377,8 @@ Parameters:
"due_date"
:
null
},
"merge_when_build_succeeds"
:
true
,
"merge_status"
:
"can_be_merged"
"merge_status"
:
"can_be_merged"
,
"subscribed"
:
true
}
```
...
...
@@ -466,7 +471,8 @@ Parameters:
"due_date"
:
null
},
"merge_when_build_succeeds"
:
true
,
"merge_status"
:
"can_be_merged"
"merge_status"
:
"can_be_merged"
,
"subscribed"
:
true
}
```
...
...
@@ -530,7 +536,8 @@ Parameters:
"due_date"
:
null
},
"merge_when_build_succeeds"
:
true
,
"merge_status"
:
"can_be_merged"
"merge_status"
:
"can_be_merged"
,
"subscribed"
:
true
}
```
...
...
lib/api/entities.rb
浏览文件 @
fb2fde9d
...
...
@@ -170,6 +170,10 @@ module API
expose
:label_names
,
as: :labels
expose
:milestone
,
using:
Entities
::
Milestone
expose
:assignee
,
:author
,
using:
Entities
::
UserBasic
expose
:subscribed
do
|
issue
,
options
|
issue
.
subscribed?
(
options
[
:current_user
])
end
end
class
MergeRequest
<
ProjectEntity
...
...
@@ -183,6 +187,10 @@ module API
expose
:milestone
,
using:
Entities
::
Milestone
expose
:merge_when_build_succeeds
expose
:merge_status
expose
:subscribed
do
|
merge_request
,
options
|
merge_request
.
subscribed?
(
options
[
:current_user
])
end
end
class
MergeRequestChanges
<
MergeRequest
...
...
lib/api/issues.rb
浏览文件 @
fb2fde9d
...
...
@@ -55,7 +55,7 @@ module API
issues
=
filter_issues_state
(
issues
,
params
[
:state
])
unless
params
[
:state
].
nil?
issues
=
filter_issues_labels
(
issues
,
params
[
:labels
])
unless
params
[
:labels
].
nil?
issues
.
reorder
(
issuable_order_by
=>
issuable_sort
)
present
paginate
(
issues
),
with:
Entities
::
Issue
present
paginate
(
issues
),
with:
Entities
::
Issue
,
current_user:
current_user
end
end
...
...
@@ -92,7 +92,7 @@ module API
end
issues
.
reorder
(
issuable_order_by
=>
issuable_sort
)
present
paginate
(
issues
),
with:
Entities
::
Issue
present
paginate
(
issues
),
with:
Entities
::
Issue
,
current_user:
current_user
end
# Get a single project issue
...
...
@@ -105,7 +105,7 @@ module API
get
":id/issues/:issue_id"
do
@issue
=
user_project
.
issues
.
find
(
params
[
:issue_id
])
not_found!
unless
can?
(
current_user
,
:read_issue
,
@issue
)
present
@issue
,
with:
Entities
::
Issue
present
@issue
,
with:
Entities
::
Issue
,
current_user:
current_user
end
# Create a new project issue
...
...
@@ -149,7 +149,7 @@ module API
issue
.
add_labels_by_names
(
params
[
:labels
].
split
(
','
))
end
present
issue
,
with:
Entities
::
Issue
present
issue
,
with:
Entities
::
Issue
,
current_user:
current_user
else
render_validation_error!
(
issue
)
end
...
...
@@ -189,7 +189,7 @@ module API
issue
.
add_labels_by_names
(
params
[
:labels
].
split
(
','
))
end
present
issue
,
with:
Entities
::
Issue
present
issue
,
with:
Entities
::
Issue
,
current_user:
current_user
else
render_validation_error!
(
issue
)
end
...
...
lib/api/merge_requests.rb
浏览文件 @
fb2fde9d
...
...
@@ -56,7 +56,7 @@ module API
end
merge_requests
=
merge_requests
.
reorder
(
issuable_order_by
=>
issuable_sort
)
present
paginate
(
merge_requests
),
with:
Entities
::
MergeRequest
present
paginate
(
merge_requests
),
with:
Entities
::
MergeRequest
,
current_user:
current_user
end
# Create MR
...
...
@@ -94,7 +94,7 @@ module API
merge_request
.
add_labels_by_names
(
params
[
:labels
].
split
(
","
))
end
present
merge_request
,
with:
Entities
::
MergeRequest
present
merge_request
,
with:
Entities
::
MergeRequest
,
current_user:
current_user
else
handle_merge_request_errors!
merge_request
.
errors
end
...
...
@@ -130,7 +130,7 @@ module API
authorize!
:read_merge_request
,
merge_request
present
merge_request
,
with:
Entities
::
MergeRequest
present
merge_request
,
with:
Entities
::
MergeRequest
,
current_user:
current_user
end
# Show MR commits
...
...
@@ -162,7 +162,7 @@ module API
merge_request
=
user_project
.
merge_requests
.
find
(
params
[
:merge_request_id
])
authorize!
:read_merge_request
,
merge_request
present
merge_request
,
with:
Entities
::
MergeRequestChanges
present
merge_request
,
with:
Entities
::
MergeRequestChanges
,
current_user:
current_user
end
# Update MR
...
...
@@ -204,7 +204,7 @@ module API
merge_request
.
add_labels_by_names
(
params
[
:labels
].
split
(
","
))
end
present
merge_request
,
with:
Entities
::
MergeRequest
present
merge_request
,
with:
Entities
::
MergeRequest
,
current_user:
current_user
else
handle_merge_request_errors!
merge_request
.
errors
end
...
...
@@ -246,7 +246,7 @@ module API
execute
(
merge_request
)
end
present
merge_request
,
with:
Entities
::
MergeRequest
present
merge_request
,
with:
Entities
::
MergeRequest
,
current_user:
current_user
end
# Cancel Merge if Merge When build succeeds is enabled
...
...
@@ -325,7 +325,7 @@ module API
get
"
#{
path
}
/closes_issues"
do
merge_request
=
user_project
.
merge_requests
.
find
(
params
[
:merge_request_id
])
issues
=
::
Kaminari
.
paginate_array
(
merge_request
.
closes_issues
(
current_user
))
present
paginate
(
issues
),
with:
Entities
::
Issue
present
paginate
(
issues
),
with:
Entities
::
Issue
,
current_user:
current_user
end
end
end
...
...
lib/api/milestones.rb
浏览文件 @
fb2fde9d
...
...
@@ -103,7 +103,7 @@ module API
authorize!
:read_milestone
,
user_project
@milestone
=
user_project
.
milestones
.
find
(
params
[
:milestone_id
])
present
paginate
(
@milestone
.
issues
),
with:
Entities
::
Issue
present
paginate
(
@milestone
.
issues
),
with:
Entities
::
Issue
,
current_user:
current_user
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录