diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-12 17:13:25 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-03-12 17:13:25 +0000 |
| commit | 1065f3d30b0d793fc0b944cc9d19c8e9858ae08a (patch) | |
| tree | b57bd1c500e27893729104f3ef69cbc5e7cb7dff /app/controllers/import | |
| parent | 59621e90343789a8d45326814e8dc85c79390369 (diff) | |
| parent | 3175438f02ca4bc0469aca097e02b2671865ef43 (diff) | |
| download | gitlab-ce-1065f3d30b0d793fc0b944cc9d19c8e9858ae08a.tar.gz | |
Merge branch 'github-org-repos' into 'master'
Fix missing GitHub organisation repositories on import page.
Private repositories belonging to organizations rather than users can't be imported because `client.repos(org.login)` was requesting `/users/:org_login/repos` (which only returns public org repo's), while we need `/orgs/:org_login/repos` (which includes both public and private). The `client.org_repos` method does this.
cc @marin This is a bug in 7.8.x, but I'm not sure if it needs a minor release now or if it can go in 7.9.
See merge request !1683
Diffstat (limited to 'app/controllers/import')
| -rw-r--r-- | app/controllers/import/github_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb index dc7668ee6fd..8650b6464dc 100644 --- a/app/controllers/import/github_controller.rb +++ b/app/controllers/import/github_controller.rb @@ -14,7 +14,7 @@ class Import::GithubController < Import::BaseController def status @repos = client.repos client.orgs.each do |org| - @repos += client.repos(org.login) + @repos += client.org_repos(org.login) end @already_added_projects = current_user.created_projects.where(import_type: "github") |