diff options
author | Stan Hu <stanhu@gmail.com> | 2015-10-19 10:32:15 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2015-10-19 10:39:59 -0700 |
commit | 4ad64ab3f4705b7fa88f855d67e0d2d268c5e395 (patch) | |
tree | 1f20b99cd90089bfd3384e045cb8349786651d54 /spec/controllers | |
parent | 87d710f5a5661f31876fb5423b6cc588230ff8dc (diff) | |
download | gitlab-ce-4ad64ab3f4705b7fa88f855d67e0d2d268c5e395.tar.gz |
Fix duplicate repositories in GitHub import page
By default, all the current user's repositories are accessible via the
/users endpoint. There's no need to traverse all the organization
repositories as well.
See:
* http://www.rubydoc.info/github/pengwynn/octokit/Octokit/Client/Repositories#repositories-instance_method
* https://developer.github.com/v3/repos/#list-your-repositories
Closes #2523
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/import/github_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/import/github_controller_spec.rb b/spec/controllers/import/github_controller_spec.rb index 766be578f7f..bbf8adef534 100644 --- a/spec/controllers/import/github_controller_spec.rb +++ b/spec/controllers/import/github_controller_spec.rb @@ -41,7 +41,7 @@ describe Import::GithubController do it "assigns variables" do @project = create(:project, import_type: 'github', creator_id: user.id) - stub_client(repos: [@repo], orgs: [@org], org_repos: [@org_repo]) + stub_client(repos: [@repo, @org_repo], orgs: [@org], org_repos: [@org_repo]) get :status |