home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 20:56:08 +10:00
Code Issues Packages Projects Releases Wiki 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
Download Patch File Download Diff File Expand all files Collapse all files
lib/gitlab/bitbucket_import/client.rb
+1 -1
View File
@@ -6,7 +6,7 @@ module Gitlab
attr_reader :consumer, :api
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']
token = credentials['bb_session']['bitbucket_access_token']
token_secret = credentials['bb_session']['bitbucket_access_token_secret']
lib/gitlab/gitlab_import/importer.rb
+1 -1
View File
@@ -5,7 +5,7 @@ module Gitlab
def initialize(project)
@project = project
credentials = import_data.credentials
credentials = import_data.stringified_credentials
if credentials && credentials["password"]
@client = Client.new(credentials["password"])
@formatter = Gitlab::ImportFormatter.new