Read about our upcoming Code of Conduct on this issue

Commit 98d88e81 authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'fix/gitlab-import-data' into 'master'

fix typo making gitlab.com importing to fail

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/565

See merge request !4181
......@@ -61,6 +61,7 @@ v 8.8.0 (unreleased)
v 8.7.6
- Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
- Fix import from gitlab.com to a private instance failure
v 8.7.5
- Fix relative links in wiki pages. !4050
......
......@@ -5,7 +5,7 @@ class Importer
def initialize(project)
@project = project
credentials = import_data
credentials = project.import_data
if credentials && credentials[:password]
@client = Client.new(credentials[:password])
@formatter = Gitlab::ImportFormatter.new
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment