Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
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
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/bitbucket_import/client.rb
lib/gitlab/bitbucket_import/client.rb
+1
-1
lib/gitlab/gitlab_import/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
...
@@ -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'
]
...
...
lib/gitlab/gitlab_import/importer.rb
View file @
255cd316
...
@@ -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
...
...
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