Commit 1d2d67b9 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'fix/gitlab-importer-issue' into 'master'

Fix gitlab importer issue

Fixed credentials not being called correctly - probably some bad refactoring or search & replace... 

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

See merge request !4301
parents 9576f77c 5bf191c6
...@@ -12,6 +12,9 @@ v 8.9.0 (unreleased) ...@@ -12,6 +12,9 @@ v 8.9.0 (unreleased)
- Todos will display target state if issuable target is 'Closed' or 'Merged' - Todos will display target state if issuable target is 'Closed' or 'Merged'
- Remove 'main language' feature - Remove 'main language' feature
v 8.8.3
- Fix gitlab importer failing to import new projects due to missing credentials
v 8.8.2 v 8.8.2
- Added remove due date button. !4209 - Added remove due date button. !4209
- Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources. !4242 - Fix Error 500 when accessing application settings due to nil disabled OAuth sign-in sources. !4242
......
...@@ -5,9 +5,9 @@ module Gitlab ...@@ -5,9 +5,9 @@ module Gitlab
def initialize(project) def initialize(project)
@project = project @project = project
credentials = project.import_data import_data = project.import_data
if credentials && credentials[:password] if import_data && import_data.credentials && import_data.credentials[:password]
@client = Client.new(credentials[:password]) @client = Client.new(import_data.credentials[:password])
@formatter = Gitlab::ImportFormatter.new @formatter = Gitlab::ImportFormatter.new
else else
raise Projects::ImportService::Error, "Unable to find project import data credentials for project ID: #{@project.id}" raise Projects::ImportService::Error, "Unable to find project import data credentials for project ID: #{@project.id}"
......
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