diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-08-07 16:01:51 +0200 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-08-08 13:34:07 +0200 |
| commit | 4c53b3945c874933d6da517ade161d66f8f87b21 (patch) | |
| tree | 333a48abe3976210eb31ec602daafffa499aa095 | |
| parent | 8505049e1f2510642715d9bfd56fc022cd42caf0 (diff) | |
| download | gitlab-ce-4c53b3945c874933d6da517ade161d66f8f87b21.tar.gz | |
Backport EE changes to the project import API
EE added a single line to this file that can easily be backported to CE,
but it appears this was overlooked. The method called is a noop in CE,
so no additional changes are necessary.
| -rw-r--r-- | lib/api/project_import.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/project_import.rb b/lib/api/project_import.rb index 71891e43dcc..bb1b037c08f 100644 --- a/lib/api/project_import.rb +++ b/lib/api/project_import.rb @@ -59,6 +59,7 @@ module API } override_params = import_params.delete(:override_params) + filter_attributes_using_license!(override_params) if override_params project = ::Projects::GitlabProjectsImportService.new( current_user, project_params, override_params |