diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-12 09:50:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-12 09:50:39 +0000 |
| commit | 1feb0894f73142c0127db86a3a84833d501e474f (patch) | |
| tree | 8a3839cbc6d7000221fe81e4c5670d3d271dc2fd /lib | |
| parent | 194c40df208526d5dc4401bc06f91d803def3740 (diff) | |
| parent | 4ccd79983274442ca21e6c73ef0863097b57350c (diff) | |
| download | gitlab-ce-1feb0894f73142c0127db86a3a84833d501e474f.tar.gz | |
Merge branch '33003-avatar-in-project-api' into 'master'
Accept avatar file in project API
Closes #33003
See merge request !11988
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/projects.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 56046742e08..50d34e8a738 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -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 |