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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
c93570d8
Commit
c93570d8
authored
Mar 29, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing a few issues after testing imports
parent
28df200c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
13 deletions
+10
-13
lib/gitlab/bitbucket_import/project_creator.rb
lib/gitlab/bitbucket_import/project_creator.rb
+3
-0
lib/gitlab/fogbugz_import/project_creator.rb
lib/gitlab/fogbugz_import/project_creator.rb
+4
-7
lib/gitlab/google_code_import/project_creator.rb
lib/gitlab/google_code_import/project_creator.rb
+3
-6
No files found.
lib/gitlab/bitbucket_import/project_creator.rb
View file @
c93570d8
...
...
@@ -22,8 +22,11 @@ module Gitlab
import_source:
"
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
"
,
import_url:
"ssh://git@bitbucket.org/
#{
repo
[
"owner"
]
}
/
#{
repo
[
"slug"
]
}
.git"
,
).
execute
import_data
=
project
.
import_data
import_data
.
credentials
.
merge!
(
"bb_session"
=>
session_data
)
import_data
.
save
project
end
end
...
...
lib/gitlab/fogbugz_import/project_creator.rb
View file @
c93570d8
...
...
@@ -24,13 +24,10 @@ module Gitlab
import_url:
Project
::
UNKNOWN_IMPORT_URL
).
execute
project
.
create_import_data
(
credentials:
{
'repo'
=>
repo
.
raw_data
,
'user_map'
=>
user_map
,
'fb_session'
=>
fb_session
}
)
import_data
=
project
.
import_data
import_data
.
credentials
.
merge!
(
'fb_session'
=>
fb_session
)
import_data
.
data
=
{
'repo'
=>
repo
.
raw_data
,
'user_map'
=>
user_map
}
import_data
.
save
project
end
...
...
lib/gitlab/google_code_import/project_creator.rb
View file @
c93570d8
...
...
@@ -24,12 +24,9 @@ module Gitlab
import_url:
repo
.
import_url
).
execute
project
.
create_import_data
(
data:
{
"repo"
=>
repo
.
raw_data
,
"user_map"
=>
user_map
}
)
import_data
=
project
.
import_data
import_data
.
data
=
{
'repo'
=>
repo
.
raw_data
,
'user_map'
=>
user_map
}
import_data
.
save
project
end
...
...
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