diff options
author | Rémy Coutable <remy@rymai.me> | 2016-07-18 09:58:48 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-18 09:58:48 +0000 |
commit | c7569fb61fc9fe12e89c1486312eae0c7438779d (patch) | |
tree | 54e07734761a048cde5dd83827d538a9c12de610 | |
parent | 240a4aa62ab24a8a7b5545dee6bd2cf00ad7596e (diff) | |
parent | c157305373593d49aaa2536f3220a6b475d74914 (diff) | |
download | gitlab-ce-c7569fb61fc9fe12e89c1486312eae0c7438779d.tar.gz |
Merge branch 'fix/import-no-repo' into 'master'
Allow empty repos on import/export
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19849
See merge request !5312
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | lib/gitlab/import_export/importer.rb | 3 | ||||
-rw-r--r-- | lib/gitlab/import_export/repo_restorer.rb | 9 | ||||
-rw-r--r-- | lib/gitlab/import_export/repo_saver.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/import_export/wiki_repo_saver.rb | 1 |
5 files changed, 6 insertions, 10 deletions
diff --git a/CHANGELOG b/CHANGELOG index 94f212324f7..52e47ba9c95 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -111,6 +111,7 @@ v 8.10.0 (unreleased) - Fix creating group with space in group path - Create Todos for Issue author when assign or mention himself (Katarzyna Kobierska) - Limit the number of retries on error to 3 for exporting projects + - Allow empty repositories on project import/export v 8.9.6 - Fix importing of events under notes for GitLab projects. !5154 diff --git a/lib/gitlab/import_export/importer.rb b/lib/gitlab/import_export/importer.rb index 8f66f48cbfe..6b69a653f12 100644 --- a/lib/gitlab/import_export/importer.rb +++ b/lib/gitlab/import_export/importer.rb @@ -44,8 +44,7 @@ module Gitlab def wiki_restorer Gitlab::ImportExport::RepoRestorer.new(path_to_bundle: wiki_repo_path, shared: @shared, - project: ProjectWiki.new(project_tree.restored_project), - wiki: true) + project: ProjectWiki.new(project_tree.restored_project)) end def uploads_restorer diff --git a/lib/gitlab/import_export/repo_restorer.rb b/lib/gitlab/import_export/repo_restorer.rb index 546dae4d122..f84de652a57 100644 --- a/lib/gitlab/import_export/repo_restorer.rb +++ b/lib/gitlab/import_export/repo_restorer.rb @@ -3,15 +3,14 @@ module Gitlab class RepoRestorer include Gitlab::ImportExport::CommandLineUtil - def initialize(project:, shared:, path_to_bundle:, wiki: false) + def initialize(project:, shared:, path_to_bundle:) @project = project @path_to_bundle = path_to_bundle @shared = shared - @wiki = wiki end def restore - return wiki? unless File.exist?(@path_to_bundle) + return true unless File.exist?(@path_to_bundle) FileUtils.mkdir_p(path_to_repo) @@ -30,10 +29,6 @@ module Gitlab def path_to_repo @project.repository.path_to_repo end - - def wiki? - @wiki - end end end end diff --git a/lib/gitlab/import_export/repo_saver.rb b/lib/gitlab/import_export/repo_saver.rb index cce43fe994b..331e14021e6 100644 --- a/lib/gitlab/import_export/repo_saver.rb +++ b/lib/gitlab/import_export/repo_saver.rb @@ -11,7 +11,7 @@ module Gitlab end def save - return false if @project.empty_repo? + return true if @project.empty_repo? # it's ok to have no repo @full_path = File.join(@shared.export_path, ImportExport.project_bundle_filename) bundle_to_disk diff --git a/lib/gitlab/import_export/wiki_repo_saver.rb b/lib/gitlab/import_export/wiki_repo_saver.rb index 1eedae39f8a..6107420e4dd 100644 --- a/lib/gitlab/import_export/wiki_repo_saver.rb +++ b/lib/gitlab/import_export/wiki_repo_saver.rb @@ -4,6 +4,7 @@ module Gitlab def save @wiki = ProjectWiki.new(@project) return true unless wiki_repository_exists? # it's okay to have no Wiki + bundle_to_disk(File.join(@shared.export_path, project_filename)) end |