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
4b88b4ff
Commit
4b88b4ff
authored
Mar 09, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix wiki path issues and spec
parent
f9c6168c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletion
+8
-1
app/services/projects/import_export/repo_bundler.rb
app/services/projects/import_export/repo_bundler.rb
+1
-1
app/services/projects/import_export/wiki_repo_bundler.rb
app/services/projects/import_export/wiki_repo_bundler.rb
+4
-0
spec/services/projects/import_export/wiki_repo_bundler_spec.rb
...services/projects/import_export/wiki_repo_bundler_spec.rb
+3
-0
No files found.
app/services/projects/import_export/repo_bundler.rb
View file @
4b88b4ff
...
...
@@ -27,7 +27,7 @@ module Projects
end
def
project_filename
"
#{
@project
.
name
space
}#{
@project
.
name
}
.bundle"
"
#{
@project
.
name
}
.bundle"
end
def
path_to_repo
...
...
app/services/projects/import_export/wiki_repo_bundler.rb
View file @
4b88b4ff
...
...
@@ -18,6 +18,10 @@ module Projects
private
def
project_filename
"
#{
@project
.
name
}
.wiki.bundle"
end
def
path_to_repo
@wiki
.
repository
.
path_to_repo
end
...
...
spec/services/projects/import_export/wiki_repo_bundler_spec.rb
View file @
4b88b4ff
...
...
@@ -8,10 +8,13 @@ describe Projects::ImportExport::WikiRepoBundler, services: true do
let
(
:export_path
)
{
"
#{
Dir
::
tmpdir
}
/project_tree_saver_spec"
}
let
(
:shared
)
{
Projects
::
ImportExport
::
Shared
.
new
(
relative_path:
project
.
path_with_namespace
)
}
let
(
:wiki_bundler
)
{
Projects
::
ImportExport
::
WikiRepoBundler
.
new
(
project:
project
,
shared:
shared
)
}
let!
(
:project_wiki
)
{
ProjectWiki
.
new
(
project
,
user
)
}
before
(
:each
)
do
project
.
team
<<
[
user
,
:master
]
allow_any_instance_of
(
Projects
::
ImportExport
).
to
receive
(
:storage_path
).
and_return
(
export_path
)
project_wiki
.
wiki
project_wiki
.
create_page
(
"index"
,
"test content"
)
end
after
(
:each
)
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