kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

fixes after more import testing

Browse source
This commit is contained in:
James Lopez 2016-04-01 17:27:07 +02:00
parent 6aeb753ba8
commit 255cd31652
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/gitlab/bitbucket_import/client.rb
View file

@ -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']

2
lib/gitlab/gitlab_import/importer.rb
View file

@ -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