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
Léo-Paul Géneau
gitlab-ce
Commits
f11920e2
Commit
f11920e2
authored
May 05, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more fixes - restoring repo
parent
28ba2176
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
lib/gitlab/import_export/import_service.rb
lib/gitlab/import_export/import_service.rb
+2
-2
lib/gitlab/import_export/repo_restorer.rb
lib/gitlab/import_export/repo_restorer.rb
+1
-1
No files found.
lib/gitlab/import_export/import_service.rb
View file @
f11920e2
...
@@ -45,11 +45,11 @@ module Gitlab
...
@@ -45,11 +45,11 @@ module Gitlab
end
end
def
repo_path
def
repo_path
File
.
join
(
'storage_path'
,
'project.bundle'
)
File
.
join
(
storage_path
,
'project.bundle'
)
end
end
def
wiki_repo_path
def
wiki_repo_path
File
.
join
(
'storage_path'
,
'project.wiki.bundle'
)
File
.
join
(
storage_path
,
'project.wiki.bundle'
)
end
end
end
end
end
end
...
...
lib/gitlab/import_export/repo_restorer.rb
View file @
f11920e2
...
@@ -14,7 +14,7 @@ module Gitlab
...
@@ -14,7 +14,7 @@ module Gitlab
FileUtils
.
mkdir_p
(
repos_path
)
FileUtils
.
mkdir_p
(
repos_path
)
FileUtils
.
mkdir_p
(
path_to_repo
)
FileUtils
.
mkdir_p
(
path_to_repo
)
git_unbundle
(
git_bin_path:
Gitlab
.
config
.
git
.
bin_path
,
repo_path:
path_to_repo
,
bundle_path:
@path_to_bundle
)
git_unbundle
(
repo_path:
path_to_repo
,
bundle_path:
@path_to_bundle
)
rescue
rescue
false
false
end
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