summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@gitlab.com>2017-04-05 12:06:27 +0000
committerJames Lopez <james@gitlab.com>2017-04-05 12:06:27 +0000
commit4a0e2abe8d07b2c7631e9bad698b9ee86d49c2e6 (patch)
tree0a37e9e057f29abd54be9eae9fb2a0e18608b032
parent6163315a1e659ac3db4daddcc45a2df92548b52e (diff)
downloadgitlab-ce-feature/gh-rake-task.tar.gz
Update import.rake to reflect changes in find_or_create_namespacefeature/gh-rake-task
-rw-r--r--lib/tasks/import.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/import.rake b/lib/tasks/import.rake
index caeb585324a..350afeb5c0b 100644
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -143,7 +143,7 @@ class GithubImport
namespace
rescue ActiveRecord::RecordNotUnique, ActiveRecord::RecordInvalid
- Namespace.find_by_path_or_name(name)
+ Namespace.where(parent: parent).find_by_path_or_name(name)
end
end
end