diff options
| author | James Lopez <james@jameslopez.es> | 2016-05-06 15:20:49 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-05-06 15:20:49 +0200 |
| commit | 7750764acdf3829e9754216acb5d1043e55852a1 (patch) | |
| tree | 31b48279bbb258d2971de00a7c1de55495fc7474 /app | |
| parent | 63df9b57855870e7dfab35b2c6cdc62ae08c9a9a (diff) | |
| parent | 49cdb778a17b25014c9439eb1a719e1fac9d04d0 (diff) | |
| download | gitlab-ce-7750764acdf3829e9754216acb5d1043e55852a1.tar.gz | |
Merge branches 'feature/project-export-ui-experimental' and 'feature/project-import' of gitlab.com:gitlab-org/gitlab-ce into feature/project-export-ui-experimental
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/projects/import_export/export_service.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/services/projects/import_export/export_service.rb b/app/services/projects/import_export/export_service.rb index 47ceff18af6..fd569e1c9ae 100644 --- a/app/services/projects/import_export/export_service.rb +++ b/app/services/projects/import_export/export_service.rb @@ -5,10 +5,7 @@ module Projects def execute(options = {}) @shared = Gitlab::ImportExport::Shared.new(relative_path: File.join(project.path_with_namespace, 'work')) # TODO handle errors - save_project_tree - bundle_repo - bundle_wiki_repo - save_all + save_all if [save_project_tree, bundle_repo, bundle_wiki_repo].all? end private |