diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-11 12:09:55 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-11 12:09:55 +0000 |
| commit | bd27a42f5497d66db227aaa5978e11c0fe072105 (patch) | |
| tree | 2dae237465c4f240371b866e0918575a3d7a7c1c /lib/api | |
| parent | e184bc1abfe4fe4fef8c25c0d2ccb4c0063e7d5e (diff) | |
| download | gitlab-ce-bd27a42f5497d66db227aaa5978e11c0fe072105.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/import_github.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/import_github.rb b/lib/api/import_github.rb index 1e839816006..0bab891eada 100644 --- a/lib/api/import_github.rb +++ b/lib/api/import_github.rb @@ -10,7 +10,11 @@ module API helpers do def client - @client ||= Gitlab::LegacyGithubImport::Client.new(params[:personal_access_token], client_options) + @client ||= if Feature.enabled?(:remove_legacy_github_client) + Gitlab::GithubImport::Client.new(params[:personal_access_token]) + else + Gitlab::LegacyGithubImport::Client.new(params[:personal_access_token], client_options) + end end def access_params |