BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
255cd316
Commit
255cd316
authored
Apr 01, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes after more import testing
parent
6aeb753b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
client.rb
lib/gitlab/bitbucket_import/client.rb
+1
-1
importer.rb
lib/gitlab/gitlab_import/importer.rb
+1
-1
No files found.
lib/gitlab/bitbucket_import/client.rb
View file @
255cd316
...
...
@@ -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
View file @
255cd316
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment