diff options
| author | Michael Kozono <mkozono@gmail.com> | 2018-03-09 01:16:21 +0300 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2018-03-14 00:45:17 +0300 |
| commit | 1f311a9caa9b3ac3d6e0cfe339390b0949632ae3 (patch) | |
| tree | 93f203511872277035b2e4fe7f78d0c32bc0960a /app/models/concerns/storage | |
| parent | ea01d4752f041afead7677872ba076682a6620db (diff) | |
Fix moving local files during namespace transfer
Diffstat (limited to 'app/models/concerns/storage')
| -rw-r--r-- | app/models/concerns/storage/legacy_namespace.rb | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/app/models/concerns/storage/legacy_namespace.rb b/app/models/concerns/storage/legacy_namespace.rb index 67a988addbe..7ab5518f17a 100644 --- a/app/models/concerns/storage/legacy_namespace.rb +++ b/app/models/concerns/storage/legacy_namespace.rb @@ -27,8 +27,15 @@ module Storage end end - Gitlab::UploadsTransfer.new.rename_namespace(full_path_was, full_path) - Gitlab::PagesTransfer.new.rename_namespace(full_path_was, full_path) + if parent_changed? + former_parent_full_path = parent_id_was.nil? ? nil : Namespace.find(parent_id_was).full_path + parent_full_path = parent&.full_path + Gitlab::UploadsTransfer.new.move_namespace(path, former_parent_full_path, parent_full_path) + Gitlab::PagesTransfer.new.move_namespace(path, former_parent_full_path, parent_full_path) + else + Gitlab::UploadsTransfer.new.rename_namespace(full_path_was, full_path) + Gitlab::PagesTransfer.new.rename_namespace(full_path_was, full_path) + end remove_exports! |