diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-03-29 13:57:21 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-04-04 19:49:48 +0200 |
| commit | e40c0085ef300aca38076af3ea2f227761084038 (patch) | |
| tree | 46f24452583fe738e4e1117d8a7d149de078397d /app/services/projects | |
| parent | 11a9fbe65b22c334bc47edf0a23b89619766553d (diff) | |
| download | gitlab-ce-e40c0085ef300aca38076af3ea2f227761084038.tar.gz | |
Store override params as import data on projects
This means import data doesn't necessarily have to have an import_url
anymore.
The `ProjectImportData` could just contain the override data in it's
serialized data attribute.
The import data is automatically cleaned up after it is finished by
the state machine.
Diffstat (limited to 'app/services/projects')
| -rw-r--r-- | app/services/projects/gitlab_projects_import_service.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/services/projects/gitlab_projects_import_service.rb b/app/services/projects/gitlab_projects_import_service.rb index a68ecb4abe1..fb4afb85588 100644 --- a/app/services/projects/gitlab_projects_import_service.rb +++ b/app/services/projects/gitlab_projects_import_service.rb @@ -5,8 +5,8 @@ module Projects class GitlabProjectsImportService attr_reader :current_user, :params - def initialize(user, params) - @current_user, @params = user, params.dup + def initialize(user, import_params, override_params = nil) + @current_user, @params, @override_params = user, import_params.dup, override_params end def execute @@ -17,6 +17,7 @@ module Projects params[:import_type] = 'gitlab_project' params[:import_source] = import_upload_path + params[:import_data] = { data: { override_params: @override_params } } if @override_params ::Projects::CreateService.new(current_user, params).execute end |