diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-04-05 12:11:45 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-04-05 12:11:45 +0300 |
commit | 32d2206b01b97cdbd6cdc13b25d98c3d3db048c4 (patch) | |
tree | f7e53f3f57f297e7650d56279526dc73758c62ab /app/services | |
parent | 4ef3e835cfee2ea63c29398d86d642571821fe32 (diff) | |
parent | 48b17e991a960c006da278d4c1f534b1db81d070 (diff) |
Merge branch 'bvl-export-import-lfs' into 'master'
Export and import LFS objects
Closes #40643
See merge request gitlab-org/gitlab-ce!18115
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/projects/import_export/export_service.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/services/projects/import_export/export_service.rb b/app/services/projects/import_export/export_service.rb index 402cddd3ec1..7bf0b90b491 100644 --- a/app/services/projects/import_export/export_service.rb +++ b/app/services/projects/import_export/export_service.rb @@ -28,7 +28,7 @@ module Projects end def save_services - [version_saver, avatar_saver, project_tree_saver, uploads_saver, repo_saver, wiki_repo_saver].all?(&:save) + [version_saver, avatar_saver, project_tree_saver, uploads_saver, repo_saver, wiki_repo_saver, lfs_saver].all?(&:save) end def version_saver @@ -55,6 +55,10 @@ module Projects Gitlab::ImportExport::WikiRepoSaver.new(project: project, shared: @shared) end + def lfs_saver + Gitlab::ImportExport::LfsSaver.new(project: project, shared: @shared) + end + def cleanup_and_notify_error Rails.logger.error("Import/Export - Project #{project.name} with ID: #{project.id} export error - #{@shared.errors.join(', ')}") |