diff options
author | Marin Jankovski <maxlazio@gmail.com> | 2017-11-21 09:27:18 +0100 |
---|---|---|
committer | Marin Jankovski <maxlazio@gmail.com> | 2017-11-21 09:27:18 +0100 |
commit | e7278b9efb89dfb67c43ddbf5da5244844d28804 (patch) | |
tree | 2d8c85d37164d71d94eda702b5127ef8b3bace9a /lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb | |
parent | 564b32e3cecc86337909f6253567c42fe3be985d (diff) | |
parent | acae8ddb34e5f7119edba8a40556ceff99dd64aa (diff) | |
download | gitlab-ce-e7278b9efb89dfb67c43ddbf5da5244844d28804.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb')
-rw-r--r-- | lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb index 75a75f61953..d32616862f0 100644 --- a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb +++ b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects.rb @@ -22,9 +22,11 @@ module Gitlab end def move_project_folders(project, old_full_path, new_full_path) - move_repository(project, old_full_path, new_full_path) - move_repository(project, "#{old_full_path}.wiki", "#{new_full_path}.wiki") - move_uploads(old_full_path, new_full_path) + unless project.hashed_storage?(:repository) + move_repository(project, old_full_path, new_full_path) + move_repository(project, "#{old_full_path}.wiki", "#{new_full_path}.wiki") + end + move_uploads(old_full_path, new_full_path) unless project.hashed_storage?(:attachments) move_pages(old_full_path, new_full_path) end |