diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 00:09:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 00:09:16 +0300 |
| commit | 154b9bae142ba15fec753f44327654595094b879 (patch) | |
| tree | 027f8ae024961778d5b00c77a72fe302f985d4f3 /lib/gitlab/bitbucket_import | |
| parent | 2c156e3c7bbade01c36eee18327f1ced6eebea79 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/bitbucket_import')
| -rw-r--r-- | lib/gitlab/bitbucket_import/importer.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb index 3a087a3ef83..5af839d8a32 100644 --- a/lib/gitlab/bitbucket_import/importer.rb +++ b/lib/gitlab/bitbucket_import/importer.rb @@ -3,8 +3,6 @@ module Gitlab module BitbucketImport class Importer - include Gitlab::ShellAdapter - LABELS = [{ title: 'bug', color: '#FF0000' }, { title: 'enhancement', color: '#428BCA' }, { title: 'proposal', color: '#69D100' }, @@ -80,7 +78,7 @@ module Gitlab wiki = WikiFormatter.new(project) - gitlab_shell.import_wiki_repository(project, wiki) + project.wiki.repository.import_repository(wiki.import_url) rescue StandardError => e errors << { type: :wiki, errors: e.message } end |