summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-05-12 17:00:38 +0000
committerDouwe Maan <douwe@gitlab.com>2017-05-12 17:00:38 +0000
commit4024200314144cd7aa0bda35f38817c8b198142a (patch)
treea89f2f9c99a9639af1fe5ff7378a70a13e9eb107 /lib
parent9b0309db449e8cbfcbbfadd7ad4e6a43975cd791 (diff)
parent48ffec9e74ad7ac381936d61f73cef86d9919513 (diff)
downloadgitlab-ce-4024200314144cd7aa0bda35f38817c8b198142a.tar.gz
Merge branch 'bvl-fix-dynamic-path-query' into 'master'
Only rename namespaces and projects with an invalid path See merge request !11338
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb
index de4e6e7c404..5397877b5d5 100644
--- a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb
+++ b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb
@@ -15,7 +15,7 @@ module Gitlab
end
def path_patterns
- @path_patterns ||= paths.map { |path| "%#{path}" }
+ @path_patterns ||= paths.flat_map { |path| ["%/#{path}", path] }
end
def rename_path_for_routable(routable)