Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1feb0894
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,发现更多精彩内容 >>
提交
1feb0894
编写于
6月 12, 2017
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '33003-avatar-in-project-api' into 'master'
Accept avatar file in project API Closes #33003 See merge request !11988
上级
194c40df
4ccd7998
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
0 deletion
+17
-0
changelogs/unreleased/33003-avatar-in-project-api.yml
changelogs/unreleased/33003-avatar-in-project-api.yml
+4
-0
doc/api/projects.md
doc/api/projects.md
+3
-0
lib/api/projects.rb
lib/api/projects.rb
+1
-0
spec/requests/api/projects_spec.rb
spec/requests/api/projects_spec.rb
+9
-0
未找到文件。
changelogs/unreleased/33003-avatar-in-project-api.yml
0 → 100644
浏览文件 @
1feb0894
---
title
:
Accept image for avatar in project API
merge_request
:
11988
author
:
Ivan Chernov
doc/api/projects.md
浏览文件 @
1feb0894
...
...
@@ -343,6 +343,7 @@ Parameters:
|
`lfs_enabled`
| boolean | no | Enable LFS |
|
`request_access_enabled`
| boolean | no | Allow users to request member access |
|
`tag_list`
| array | no | The list of tags for a project; put array of tags, that should be finally assigned to a project |
|
`avatar`
| mixed | no | Image file for avatar of the project |
### Create project for user
...
...
@@ -377,6 +378,7 @@ Parameters:
|
`lfs_enabled`
| boolean | no | Enable LFS |
|
`request_access_enabled`
| boolean | no | Allow users to request member access |
|
`tag_list`
| array | no | The list of tags for a project; put array of tags, that should be finally assigned to a project |
|
`avatar`
| mixed | no | Image file for avatar of the project |
### Edit project
...
...
@@ -410,6 +412,7 @@ Parameters:
|
`lfs_enabled`
| boolean | no | Enable LFS |
|
`request_access_enabled`
| boolean | no | Allow users to request member access |
|
`tag_list`
| array | no | The list of tags for a project; put array of tags, that should be finally assigned to a project |
|
`avatar`
| mixed | no | Image file for avatar of the project |
### Fork project
...
...
lib/api/projects.rb
浏览文件 @
1feb0894
...
...
@@ -22,6 +22,7 @@ module API
optional
:only_allow_merge_if_pipeline_succeeds
,
type:
Boolean
,
desc:
'Only allow to merge if builds succeed'
optional
:only_allow_merge_if_all_discussions_are_resolved
,
type:
Boolean
,
desc:
'Only allow to merge if all discussions are resolved'
optional
:tag_list
,
type:
Array
[
String
],
desc:
'The list of tags for a project'
optional
:avatar
,
type:
File
,
desc:
'Avatar image for project'
end
params
:optional_params
do
...
...
spec/requests/api/projects_spec.rb
浏览文件 @
1feb0894
...
...
@@ -398,6 +398,15 @@ describe API::Projects do
expect
(
json_response
[
'tag_list'
]).
to
eq
(
%w[tagFirst tagSecond]
)
end
it
'uploads avatar for project a project'
do
project
=
attributes_for
(
:project
,
avatar:
fixture_file_upload
(
Rails
.
root
+
'spec/fixtures/banana_sample.gif'
,
'image/gif'
))
post
api
(
'/projects'
,
user
),
project
project_id
=
json_response
[
'id'
]
expect
(
json_response
[
'avatar_url'
]).
to
eq
(
"http://localhost/uploads/system/project/avatar/
#{
project_id
}
/banana_sample.gif"
)
end
it
'sets a project as allowing merge even if build fails'
do
project
=
attributes_for
(
:project
,
{
only_allow_merge_if_pipeline_succeeds:
false
})
post
api
(
'/projects'
,
user
),
project
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录