diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-04-30 20:06:11 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-05-01 11:14:24 +0200 |
| commit | 2e2a63c8669a084ed3a3aa5e770158ea2cb43a9d (patch) | |
| tree | 3dd6be25223a6fb48c0119a55b62efccade19680 /lib/gitlab/database | |
| parent | 08b1bc3489e8d4e6d5786221bad090f16a1c021f (diff) | |
| download | gitlab-ce-2e2a63c8669a084ed3a3aa5e770158ea2cb43a9d.tar.gz | |
Rename child namespaces in migrationhelpers
Diffstat (limited to 'lib/gitlab/database')
| -rw-r--r-- | lib/gitlab/database/rename_reserved_paths_migration/v1.rb | 7 | ||||
| -rw-r--r-- | lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lib/gitlab/database/rename_reserved_paths_migration/v1.rb b/lib/gitlab/database/rename_reserved_paths_migration/v1.rb index 6296e964187..1966f5c1cec 100644 --- a/lib/gitlab/database/rename_reserved_paths_migration/v1.rb +++ b/lib/gitlab/database/rename_reserved_paths_migration/v1.rb @@ -7,11 +7,16 @@ module Gitlab end def rename_wildcard_paths(one_or_more_paths) + rename_child_paths(one_or_more_paths) paths = Array(one_or_more_paths) - RenameNamespaces.new(paths, self).rename_namespaces(type: :wildcard) RenameProjects.new(paths, self).rename_projects end + def rename_child_paths(one_or_more_paths) + paths = Array(one_or_more_paths) + RenameNamespaces.new(paths, self).rename_namespaces(type: :child) + end + def rename_root_paths(paths) paths = Array(paths) RenameNamespaces.new(paths, self).rename_namespaces(type: :top_level) diff --git a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb index d863de90844..b9f4f3cff3c 100644 --- a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb +++ b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces.rb @@ -13,7 +13,7 @@ module Gitlab def namespaces_for_paths(type:) namespaces = case type - when :wildcard + when :child MigrationClasses::Namespace.where.not(parent_id: nil) when :top_level MigrationClasses::Namespace.where(parent_id: nil) |