summaryrefslogtreecommitdiff
path: root/app/controllers/import
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2017-03-30 21:24:49 +0000
committerRobert Speicher <robert@gitlab.com>2017-03-30 21:24:49 +0000
commit9bac3bfc587466a42194350ae51d2e9ad74a7627 (patch)
tree9968950dcff45522d586a8e1d3197f6ba7f2e19d /app/controllers/import
parent6ff5e7f798e13a94666336ca51211d31bdd2a4b5 (diff)
downloadgitlab-ce-9bac3bfc587466a42194350ae51d2e9ad74a7627.tar.gz
Allow users to import GitHub projects to subgroups
Diffstat (limited to 'app/controllers/import')
-rw-r--r--app/controllers/import/base_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/import/base_controller.rb b/app/controllers/import/base_controller.rb
index 256c41e6145..eeee027ef2d 100644
--- a/app/controllers/import/base_controller.rb
+++ b/app/controllers/import/base_controller.rb
@@ -11,7 +11,7 @@ class Import::BaseController < ApplicationController
namespace.add_owner(current_user)
namespace
rescue ActiveRecord::RecordNotUnique, ActiveRecord::RecordInvalid
- Namespace.find_by_path_or_name(name)
+ Namespace.find_by_full_path(name)
end
end
end