diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-20 10:51:49 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-20 10:51:49 +0000 |
| commit | 97eafd4b3dbc186fc3d633c20a7e364ebf31849d (patch) | |
| tree | 8eeda2b927fa13fd2c8052dfb13f0c0caf9c4164 | |
| parent | 1f1b3a094206b199393d8de537f4ec0843f2afe2 (diff) | |
| parent | 4ad64ab3f4705b7fa88f855d67e0d2d268c5e395 (diff) | |
| download | gitlab-ce-97eafd4b3dbc186fc3d633c20a7e364ebf31849d.tar.gz | |
Merge branch 'remove-duplicate-repos-in-github-import' into 'master'
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
See merge request !1644
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/controllers/import/github_controller.rb | 4 | ||||
| -rw-r--r-- | spec/controllers/import/github_controller_spec.rb | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index 634cf15f946..5671d8b1d81 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.2.0 (unreleased) + - Fix duplicate repositories in GitHub import page (Stan Hu) - Show last project commit to default branch on project home page - Highlight comment based on anchor in URL - Adds ability to remove the forked relationship from project settings screen. (Han Loong Liauw) diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb index aae77d384c6..67bf4190e7e 100644 --- a/app/controllers/import/github_controller.rb +++ b/app/controllers/import/github_controller.rb @@ -11,10 +11,6 @@ class Import::GithubController < Import::BaseController def status @repos = client.repos - client.orgs.each do |org| - @repos += client.org_repos(org.login) - end - @already_added_projects = current_user.created_projects.where(import_type: "github") already_added_projects_names = @already_added_projects.pluck(:import_source) 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 |