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

Merge branch 'fix/gitlab-import-data' into 'master'
98d88e81 · Robert Speicher · 28eea9bd · ab2a1d23 · 98d88e81 · 98d88e81
Commit 98d88e81 authored May 17, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

importer.rb lib/gitlab/gitlab_import/importer.rb +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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

--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
@@ -5,7 +5,7 @@ module Gitlab

      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