diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-09-10 16:24:12 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-09-10 16:24:12 +0000 |
| commit | 0498ec89a1b44caad91603215d1ea96aaa4e1eb8 (patch) | |
| tree | ad30eb329787116653940d22a95cad1e99ebb0ab /lib/api/helpers/projects_helpers.rb | |
| parent | 0078ea44c292cd0e5eb7f4ae52358087c8ee34db (diff) | |
| parent | daf7810e2ee323e39e3cc0b1c6f3fe15a9977a14 (diff) | |
| download | gitlab-ce-60549-environment-fetch.tar.gz | |
Merge branch 'ac-cop-scalability-api-files' into 'master'60549-environment-fetch
Add Scalability/FileUploads cop
Closes gitlab-ee#14925
See merge request gitlab-org/gitlab-ce!32864
Diffstat (limited to 'lib/api/helpers/projects_helpers.rb')
| -rw-r--r-- | lib/api/helpers/projects_helpers.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/helpers/projects_helpers.rb b/lib/api/helpers/projects_helpers.rb index 51b7cf05c8f..c1e7af33235 100644 --- a/lib/api/helpers/projects_helpers.rb +++ b/lib/api/helpers/projects_helpers.rb @@ -38,7 +38,8 @@ 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' + # TODO: remove rubocop disable - https://gitlab.com/gitlab-org/gitlab-ee/issues/14960 + optional :avatar, type: File, desc: 'Avatar image for project' # rubocop:disable Scalability/FileUploads optional :printing_merge_request_link_enabled, type: Boolean, desc: 'Show link to create/view merge request when pushing from the command line' optional :merge_method, type: String, values: %w(ff rebase_merge merge), desc: 'The merge method used when merging merge requests' optional :initialize_with_readme, type: Boolean, desc: "Initialize a project with a README.md" |