diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-03-31 16:34:13 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-03-31 16:34:13 +0200 |
commit | 737f322e41a640194b3df1a4c6cd2b1019268221 (patch) | |
tree | e9d0682ac0addad49826cd30a55e54d64a6e21bd /app/controllers/import/github_controller.rb | |
parent | 33a8f53f7a8fdc40d0f0ee4245258c8dba99198a (diff) | |
download | gitlab-ce-737f322e41a640194b3df1a4c6cd2b1019268221.tar.gz |
Import GitHub, Bitbucket or GitLab.com projects owned by authenticated user into current namespace.
Diffstat (limited to 'app/controllers/import/github_controller.rb')
-rw-r--r-- | app/controllers/import/github_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb index 8650b6464dc..87b41454c77 100644 --- a/app/controllers/import/github_controller.rb +++ b/app/controllers/import/github_controller.rb @@ -31,8 +31,11 @@ class Import::GithubController < Import::BaseController def create @repo_id = params[:repo_id].to_i repo = client.repo(@repo_id) - @target_namespace = params[:new_namespace].presence || repo.owner.login @project_name = repo.name + + repo_owner = repo.owner.login + repo_owner = current_user.username if repo_owner == client.user.login + @target_namespace = params[:new_namespace].presence || repo_owner namespace = get_or_create_namespace || (render and return) |