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
f06c5516
Commit
f06c5516
authored
May 12, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix issue in import_service
parent
385d6df2
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
lib/gitlab/import_export/import_service.rb
lib/gitlab/import_export/import_service.rb
+3
-3
No files found.
lib/gitlab/import_export/import_service.rb
View file @
f06c5516
...
@@ -10,7 +10,7 @@ module Gitlab
...
@@ -10,7 +10,7 @@ module Gitlab
@archive_file
=
archive_file
@archive_file
=
archive_file
@current_user
=
owner
@current_user
=
owner
@namespace
=
Namespace
.
find
(
namespace_id
)
@namespace
=
Namespace
.
find
(
namespace_id
)
@shared
=
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
path_with_namespace
,
project_path:
project_path
)
@shared
=
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
path_with_namespace
(
project_path
)
,
project_path:
project_path
)
end
end
def
execute
def
execute
...
@@ -43,8 +43,8 @@ module Gitlab
...
@@ -43,8 +43,8 @@ module Gitlab
project:
ProjectWiki
.
new
(
project_tree
.
project
)).
restore
project:
ProjectWiki
.
new
(
project_tree
.
project
)).
restore
end
end
def
path_with_namespace
def
path_with_namespace
(
project_path
)
File
.
join
(
@namespace
.
path
,
@shared
.
opts
[
:project_path
]
)
File
.
join
(
@namespace
.
path
,
project_path
)
end
end
def
repo_path
def
repo_path
...
...
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