diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-08-07 19:27:42 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-08-07 19:27:42 +0000 |
| commit | dd3d422193c5f8d11ca15d3dac2ac33e55736789 (patch) | |
| tree | e278567403e6855e4913822bdc2781c1afc0649b /lib/gitlab | |
| parent | 4c8b666893aa9f5ab94b800489fd9e3240ad4f5e (diff) | |
| parent | 38704e4247616a3122108b01b61798eed21461c9 (diff) | |
| download | gitlab-ce-dd3d422193c5f8d11ca15d3dac2ac33e55736789.tar.gz | |
Merge branch 'github' into 'master'
Improve GitHub importer
Closes #27429
See merge request !12886
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/import_sources.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/import_sources.rb b/lib/gitlab/import_sources.rb index 52276cbcd9a..5404dc11a87 100644 --- a/lib/gitlab/import_sources.rb +++ b/lib/gitlab/import_sources.rb @@ -8,7 +8,7 @@ module Gitlab ImportSource = Struct.new(:name, :title, :importer) ImportTable = [ - ImportSource.new('github', 'GitHub', Gitlab::GithubImport::Importer), + ImportSource.new('github', 'GitHub', Github::Import), ImportSource.new('bitbucket', 'Bitbucket', Gitlab::BitbucketImport::Importer), ImportSource.new('gitlab', 'GitLab.com', Gitlab::GitlabImport::Importer), ImportSource.new('google_code', 'Google Code', Gitlab::GoogleCodeImport::Importer), |