summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2014-10-08 12:05:18 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2014-10-08 12:05:18 +0200
commite1123e08f4f063d359d78e1ca94288b9dd828be5 (patch)
tree4caefc002ed24a70de0bb2f489f084eea35264c1
parentb694bf6f64171692fba75a54c6d98dab6e8cda8c (diff)
parentae5381f2cc4a7b0f2cbb67d6cbbf57b10de1e307 (diff)
downloadgitlab-ce-e1123e08f4f063d359d78e1ca94288b9dd828be5.tar.gz
Merge pull request #7988 from marcaube/patch-1
Import - Display message when skipping repo
-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