diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-17 19:49:12 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-05-19 13:07:27 -0500 |
| commit | fa90dcc16ac7f6fb0650d3ed76df81717b18310d (patch) | |
| tree | 5f49b5ef1afbe3ab7b32d1aaeb9774edc1d8580f | |
| parent | 4b0cde7f19a9d529136f61c3fc8d338c9ec0fd50 (diff) | |
| download | gitlab-ce-fa90dcc16ac7f6fb0650d3ed76df81717b18310d.tar.gz | |
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
| -rw-r--r-- | lib/gitlab/gitlab_import/importer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb index 96717b42bae..3e51c06877e 100644 --- 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 |