Read about our upcoming Code of Conduct on this issue

Commit 6aeb753b authored by James Lopez's avatar James Lopez
Browse files

fix github import issues

parent e694dd469a2e
......@@ -418,7 +418,7 @@ def import_url
def create_or_update_import_data(credentials)
project_import_data = import_data || build_import_data
project_import_data.credentials ||= {}
project_import_data.credentials.merge!(credentials)
project_import_data.credentials = project_import_data.credentials.merge(credentials)
project_import_data.save
end
......
......@@ -8,7 +8,7 @@ class Importer
def initialize(project)
@project = project
if import_data_credentials
@client = Client.new(import_data_credentials['user'])
@client = Client.new(import_data_credentials[:user])
@formatter = Gitlab::ImportFormatter.new
else
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