summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-08 15:08:22 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-08 15:08:22 +0300
commit80f9b758e09f04e8b7c91a889aa1f8d16057060c (patch)
tree963bea1b599a86535bde9237ea2869a730084985 /lib
parent17835f095fb10168d5d2f6b2fd4c136844c2bfd1 (diff)
parente1123e08f4f063d359d78e1ca94288b9dd828be5 (diff)
downloadgitlab-ce-80f9b758e09f04e8b7c91a889aa1f8d16057060c.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Diffstat (limited to 'lib')
-rw-r--r--lib/tasks/gitlab/import.rake5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/import.rake b/lib/tasks/gitlab/import.rake
index cbfa736c84c..b6ed874e11a 100644
--- a/lib/tasks/gitlab/import.rake
+++ b/lib/tasks/gitlab/import.rake
@@ -27,7 +27,10 @@ namespace :gitlab do
group_name = nil if group_name == '.'
# Skip if group or user
- next if namespaces.include?(name)
+ if namespaces.include?(name)
+ puts "Skipping #{project.name} due to namespace conflict with group or user".yellow
+ next
+ end
puts "Processing #{repo_path}".yellow