diff options
| author | Ciro Santilli <ciro.santilli@gmail.com> | 2014-10-23 23:39:48 +0200 |
|---|---|---|
| committer | Ciro Santilli <ciro.santilli@gmail.com> | 2014-10-24 17:26:33 +0200 |
| commit | 706b6b5acb8e900e3d43e810d83829f9931bb9ec (patch) | |
| tree | 1b40faaaa8323e6da12af5955cf89b89558eb944 /lib/tasks/gitlab | |
| parent | 1c1d9f78a4d7e569fda4ee70603a7bc2472a4ae4 (diff) | |
| download | gitlab-ce-706b6b5acb8e900e3d43e810d83829f9931bb9ec.tar.gz | |
Fix import.rake failed import if project name is
also an existing namespace. E.g., when trying to import
group/root.git, that would fail if there is an user called root.
Diffstat (limited to 'lib/tasks/gitlab')
| -rw-r--r-- | lib/tasks/gitlab/import.rake | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake index 159568f2883..e0297023bfc 100644 --- a/lib/tasks/gitlab/import.rake +++ b/lib/tasks/gitlab/import.rake @@ -15,8 +15,6 @@ namespace :gitlab do git_base_path = Gitlab.config.gitlab_shell.repos_path repos_to_import = Dir.glob(git_base_path + '/**/*.git') - namespaces = Namespace.pluck(:path) - repos_to_import.each do |repo_path| # strip repo base path repo_path[0..git_base_path.length] = '' @@ -26,12 +24,6 @@ namespace :gitlab do group_name = File.dirname path group_name = nil if group_name == '.' - # Skip if group or user - if namespaces.include?(name) - puts "Skipping #{project.name} due to namespace conflict with group or user".yellow - next - end - puts "Processing #{repo_path}".yellow if path =~ /\.wiki\Z/ @@ -53,9 +45,9 @@ namespace :gitlab do # find group namespace if group_name - group = Group.find_by(path: group_name) + group = Namespace.find_by(path: group_name) # create group namespace - if !group + unless group group = Group.new(:name => group_name) group.path = group_name group.owner = user |