diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-25 05:12:24 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-25 05:12:24 -0700 |
| commit | 537f87a169576544b26347b5b3a6ab22d2cbfc00 (patch) | |
| tree | 58cb66cf9639ef46acc4927fef0b4e0a84269568 /app/controllers/import | |
| parent | f94b52256d1bedfe6b01ef31f0bed0615b10d918 (diff) | |
| parent | d22db4f492d5ae676bea6bc699203d2fc120fe96 (diff) | |
| download | gitlab-ce-537f87a169576544b26347b5b3a6ab22d2cbfc00.tar.gz | |
Merge branch 'master' into sh-support-bitbucket-server-import
Diffstat (limited to 'app/controllers/import')
| -rw-r--r-- | app/controllers/import/gitlab_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/import/gitlab_controller.rb b/app/controllers/import/gitlab_controller.rb index fccbdbca0f6..53f70446d95 100644 --- a/app/controllers/import/gitlab_controller.rb +++ b/app/controllers/import/gitlab_controller.rb @@ -1,4 +1,7 @@ class Import::GitlabController < Import::BaseController + MAX_PROJECT_PAGES = 15 + PER_PAGE_PROJECTS = 100 + before_action :verify_gitlab_import_enabled before_action :gitlab_auth, except: :callback @@ -10,7 +13,7 @@ class Import::GitlabController < Import::BaseController end def status - @repos = client.projects + @repos = client.projects(starting_page: 1, page_limit: MAX_PROJECT_PAGES, per_page: PER_PAGE_PROJECTS) @already_added_projects = find_already_added_projects('gitlab') already_added_projects_names = @already_added_projects.pluck(:import_source) |