diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-12 15:21:37 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-12 15:21:37 +0300 |
| commit | 2d3fd6a142d286bb7d6355ed3601e618bc246112 (patch) | |
| tree | 1b1c99150ac063d3d3e90583ce7b3c657e93ad5a /lib/gitlab/import_sources.rb | |
| parent | bb98ed112c509c6265ba4dff81d7987c52a8748c (diff) | |
| parent | eddf34f4af8a2cfdcea2586a91b0fc38a7ba0277 (diff) | |
Merge branch 'master' into sh-support-bitbucket-server-import
Diffstat (limited to 'lib/gitlab/import_sources.rb')
| -rw-r--r-- | lib/gitlab/import_sources.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/import_sources.rb b/lib/gitlab/import_sources.rb index 10289af6b25..f901d1fdb5a 100644 --- a/lib/gitlab/import_sources.rb +++ b/lib/gitlab/import_sources.rb @@ -17,7 +17,8 @@ module Gitlab ImportSource.new('fogbugz', 'FogBugz', Gitlab::FogbugzImport::Importer), ImportSource.new('git', 'Repo by URL', nil), ImportSource.new('gitlab_project', 'GitLab export', Gitlab::ImportExport::Importer), - ImportSource.new('gitea', 'Gitea', Gitlab::LegacyGithubImport::Importer) + ImportSource.new('gitea', 'Gitea', Gitlab::LegacyGithubImport::Importer), + ImportSource.new('manifest', 'Manifest file', nil) ].freeze class << self |