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
This commit is contained in:
parent
87d710f5a5
commit
4ad64ab3f4
3 changed files with 2 additions and 5 deletions
|
@ -1,6 +1,7 @@
|
||||||
Please view this file on the master branch, on stable branches it's out of date.
|
Please view this file on the master branch, on stable branches it's out of date.
|
||||||
|
|
||||||
v 8.2.0 (unreleased)
|
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
|
- Show last project commit to default branch on project home page
|
||||||
- Highlight comment based on anchor in URL
|
- Highlight comment based on anchor in URL
|
||||||
- Adds ability to remove the forked relationship from project settings screen. (Han Loong Liauw)
|
- Adds ability to remove the forked relationship from project settings screen. (Han Loong Liauw)
|
||||||
|
|
|
@ -11,10 +11,6 @@ class Import::GithubController < Import::BaseController
|
||||||
|
|
||||||
def status
|
def status
|
||||||
@repos = client.repos
|
@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 = current_user.created_projects.where(import_type: "github")
|
||||||
already_added_projects_names = @already_added_projects.pluck(:import_source)
|
already_added_projects_names = @already_added_projects.pluck(:import_source)
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ describe Import::GithubController do
|
||||||
|
|
||||||
it "assigns variables" do
|
it "assigns variables" do
|
||||||
@project = create(:project, import_type: 'github', creator_id: user.id)
|
@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
|
get :status
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue