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
54f00b74
Commit
54f00b74
authored
Jan 02, 2018
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix wiki check
parent
9d0bceb3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
+3
-0
lib/gitlab/bare_repository_import/importer.rb
lib/gitlab/bare_repository_import/importer.rb
+2
-0
spec/lib/gitlab/bare_repository_import/importer_spec.rb
spec/lib/gitlab/bare_repository_import/importer_spec.rb
+1
-0
No files found.
lib/gitlab/bare_repository_import/importer.rb
View file @
54f00b74
...
@@ -77,6 +77,8 @@ module Gitlab
...
@@ -77,6 +77,8 @@ module Gitlab
if
bare_repo
.
wiki_exists?
if
bare_repo
.
wiki_exists?
FileUtils
.
mv
(
wiki_path
,
File
.
join
(
project
.
repository_storage_path
,
project
.
disk_path
+
'.wiki.git'
))
FileUtils
.
mv
(
wiki_path
,
File
.
join
(
project
.
repository_storage_path
,
project
.
disk_path
+
'.wiki.git'
))
else
project
.
create_wiki
end
end
true
true
...
...
spec/lib/gitlab/bare_repository_import/importer_spec.rb
View file @
54f00b74
...
@@ -137,6 +137,7 @@ describe Gitlab::BareRepositoryImport::Importer, repository: true do
...
@@ -137,6 +137,7 @@ describe Gitlab::BareRepositoryImport::Importer, repository: true do
project
=
Project
.
find_by_full_path
(
"
#{
admin
.
full_path
}
/
#{
project_path
}
"
)
project
=
Project
.
find_by_full_path
(
"
#{
admin
.
full_path
}
/
#{
project_path
}
"
)
expect
(
File
).
to
exist
(
File
.
join
(
project
.
repository_storage_path
,
project
.
disk_path
+
'.git'
))
expect
(
File
).
to
exist
(
File
.
join
(
project
.
repository_storage_path
,
project
.
disk_path
+
'.git'
))
expect
(
File
).
to
exist
(
File
.
join
(
project
.
repository_storage_path
,
project
.
disk_path
+
'.wiki.git'
))
end
end
it
'moves an existing project to the correct path'
do
it
'moves an existing project to the correct path'
do
...
...
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