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/project_import.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/project_import.rb')
| -rw-r--r-- | lib/api/project_import.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/api/project_import.rb b/lib/api/project_import.rb index bb1b037c08f..9b5e0727184 100644 --- a/lib/api/project_import.rb +++ b/lib/api/project_import.rb @@ -27,7 +27,8 @@ module API resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do params do requires :path, type: String, desc: 'The new project path and name' - requires :file, type: File, desc: 'The project export file to be imported' + # TODO: remove rubocop disable - https://gitlab.com/gitlab-org/gitlab-ee/issues/14960 + requires :file, type: File, desc: 'The project export file to be imported' # rubocop:disable Scalability/FileUploads optional :namespace, type: String, desc: "The ID or name of the namespace that the project will be imported into. Defaults to the current user's namespace." optional :overwrite, type: Boolean, default: false, desc: 'If there is a project in the same namespace and with the same name overwrite it' optional :override_params, |