Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9664424c
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,发现更多精彩内容 >>
提交
9664424c
编写于
1月 13, 2016
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'ci/api-projects' into 'master'
Extend projects API with CI data Reference #4264 See merge request !2303
上级
bbc28428
fc4108b3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
26 addition
and
9 deletion
+26
-9
doc/api/projects.md
doc/api/projects.md
+14
-3
lib/api/entities.rb
lib/api/entities.rb
+1
-0
lib/api/projects.rb
lib/api/projects.rb
+11
-6
未找到文件。
doc/api/projects.md
浏览文件 @
9664424c
...
...
@@ -76,7 +76,10 @@ Parameters:
"updated_at"
:
"2013-09-30T13: 46: 02Z"
},
"archived"
:
false
,
"avatar_url"
:
"http://example.com/uploads/project/avatar/4/uploads/avatar.png"
"avatar_url"
:
"http://example.com/uploads/project/avatar/4/uploads/avatar.png"
,
"shared_runners_enabled"
:
true
,
"forks_count"
:
0
,
"star_count"
:
0
},
{
"id"
:
6
,
...
...
@@ -129,7 +132,11 @@ Parameters:
}
},
"archived"
:
false
,
"avatar_url"
:
null
"avatar_url"
:
null
,
"shared_runners_enabled"
:
true
,
"forks_count"
:
0
,
"star_count"
:
0
,
"runners_token"
:
"b8547b1dc37721d05889db52fa2f02"
}
]
```
...
...
@@ -244,7 +251,11 @@ Parameters:
}
},
"archived"
:
false
,
"avatar_url"
:
"http://example.com/uploads/project/avatar/3/uploads/avatar.png"
"avatar_url"
:
"http://example.com/uploads/project/avatar/3/uploads/avatar.png"
,
"shared_runners_enabled"
:
true
,
"forks_count"
:
0
,
"star_count"
:
0
,
"runners_token"
:
"b8bc4a7a29eb76ea83cf79e4908c2b"
}
```
...
...
lib/api/entities.rb
浏览文件 @
9664424c
...
...
@@ -71,6 +71,7 @@ module API
expose
:avatar_url
expose
:star_count
,
:forks_count
expose
:open_issues_count
,
if:
lambda
{
|
project
,
options
|
project
.
issues_enabled?
&&
project
.
default_issues_tracker?
}
expose
:runners_token
,
if:
lambda
{
|
_project
,
options
|
options
[
:user_can_admin_project
]
}
end
class
ProjectMember
<
UserBasic
...
...
lib/api/projects.rb
浏览文件 @
9664424c
...
...
@@ -69,7 +69,8 @@ module API
# Example Request:
# GET /projects/:id
get
":id"
do
present
user_project
,
with:
Entities
::
ProjectWithAccess
,
user:
current_user
present
user_project
,
with:
Entities
::
ProjectWithAccess
,
user:
current_user
,
user_can_admin_project:
can?
(
current_user
,
:admin_project
,
user_project
)
end
# Get events for a single project
...
...
@@ -118,7 +119,8 @@ module API
attrs
=
map_public_to_visibility_level
(
attrs
)
@project
=
::
Projects
::
CreateService
.
new
(
current_user
,
attrs
).
execute
if
@project
.
saved?
present
@project
,
with:
Entities
::
Project
present
@project
,
with:
Entities
::
Project
,
user_can_admin_project:
can?
(
current_user
,
:admin_project
,
@project
)
else
if
@project
.
errors
[
:limit_reached
].
present?
error!
(
@project
.
errors
[
:limit_reached
],
403
)
...
...
@@ -163,7 +165,8 @@ module API
attrs
=
map_public_to_visibility_level
(
attrs
)
@project
=
::
Projects
::
CreateService
.
new
(
user
,
attrs
).
execute
if
@project
.
saved?
present
@project
,
with:
Entities
::
Project
present
@project
,
with:
Entities
::
Project
,
user_can_admin_project:
can?
(
current_user
,
:admin_project
,
@project
)
else
render_validation_error!
(
@project
)
end
...
...
@@ -182,8 +185,9 @@ module API
if
@forked_project
.
errors
.
any?
conflict!
(
@forked_project
.
errors
.
messages
)
else
present
@forked_project
,
with:
Entities
::
Project
end
present
@forked_project
,
with:
Entities
::
Project
,
user_can_admin_project:
can?
(
current_user
,
:admin_project
,
@forked_project
)
end
end
# Update an existing project
...
...
@@ -229,7 +233,8 @@ module API
if
user_project
.
errors
.
any?
render_validation_error!
(
user_project
)
else
present
user_project
,
with:
Entities
::
Project
present
user_project
,
with:
Entities
::
Project
,
user_can_admin_project:
can?
(
current_user
,
:admin_project
,
user_project
)
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录