BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
98c57e9a
Commit
98c57e9a
authored
Oct 26, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/add-path-attr-to-wiki-file' into 'master'
Add path attribute to WikiFile class Closes #39420 See merge request gitlab-org/gitlab-ce!15019
parents
7ece18f1
76becfb5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
4 deletions
+14
-4
fix-add-path-attr-to-wiki-file.yml
changelogs/unreleased/fix-add-path-attr-to-wiki-file.yml
+5
-0
wiki_file.rb
lib/gitlab/git/wiki_file.rb
+2
-1
gollum_tags_filter_spec.rb
spec/lib/banzai/filter/gollum_tags_filter_spec.rb
+7
-3
No files found.
changelogs/unreleased/fix-add-path-attr-to-wiki-file.yml
0 → 100644
View file @
98c57e9a
---
title
:
Fix broken wiki pages that link to a wiki file
merge_request
:
15019
author
:
type
:
fixed
lib/gitlab/git/wiki_file.rb
View file @
98c57e9a
module
Gitlab
module
Git
class
WikiFile
attr_reader
:mime_type
,
:raw_data
,
:name
attr_reader
:mime_type
,
:raw_data
,
:name
,
:path
# This class is meant to be serializable so that it can be constructed
# by Gitaly and sent over the network to GitLab.
...
...
@@ -13,6 +13,7 @@ module Gitlab
@mime_type
=
gollum_file
.
mime_type
@raw_data
=
gollum_file
.
raw_data
@name
=
gollum_file
.
name
@path
=
gollum_file
.
path
end
end
end
...
...
spec/lib/banzai/filter/gollum_tags_filter_spec.rb
View file @
98c57e9a
...
...
@@ -15,9 +15,13 @@ describe Banzai::Filter::GollumTagsFilter do
context
'linking internal images'
do
it
'creates img tag if image exists'
do
file
=
Gollum
::
File
.
new
(
project_wiki
.
wiki
)
expect
(
file
).
to
receive
(
:path
).
and_return
(
'images/image.jpg'
)
expect
(
project_wiki
).
to
receive
(
:find_file
).
with
(
'images/image.jpg'
).
and_return
(
file
)
gollum_file_double
=
double
(
'Gollum::File'
,
mime_type:
'image/jpeg'
,
name:
'images/image.jpg'
,
path:
'images/image.jpg'
,
raw_data:
''
)
wiki_file
=
Gitlab
::
Git
::
WikiFile
.
new
(
gollum_file_double
)
expect
(
project_wiki
).
to
receive
(
:find_file
).
with
(
'images/image.jpg'
).
and_return
(
wiki_file
)
tag
=
'[[images/image.jpg]]'
doc
=
filter
(
"See
#{
tag
}
"
,
project_wiki:
project_wiki
)
...
...
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