Commit 255cd316 authored by James Lopez's avatar James Lopez

fixes after more import testing

parent 6aeb753b
...@@ -6,7 +6,7 @@ module Gitlab ...@@ -6,7 +6,7 @@ module Gitlab
attr_reader :consumer, :api attr_reader :consumer, :api
def self.from_project(project) def self.from_project(project)
credentials = project.import_data.credentials if project.import_data credentials = project.import_data.stringified_credentials if project.import_data
if defined?(credentials) && credentials['bb_session'] if defined?(credentials) && credentials['bb_session']
token = credentials['bb_session']['bitbucket_access_token'] token = credentials['bb_session']['bitbucket_access_token']
token_secret = credentials['bb_session']['bitbucket_access_token_secret'] token_secret = credentials['bb_session']['bitbucket_access_token_secret']
......
...@@ -5,7 +5,7 @@ module Gitlab ...@@ -5,7 +5,7 @@ module Gitlab
def initialize(project) def initialize(project)
@project = project @project = project
credentials = import_data.credentials credentials = import_data.stringified_credentials
if credentials && credentials["password"] if credentials && credentials["password"]
@client = Client.new(credentials["password"]) @client = Client.new(credentials["password"])
@formatter = Gitlab::ImportFormatter.new @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