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
e5430712
Commit
e5430712
authored
Dec 04, 2017
by
haseeb
Committed by
Robert Speicher
Dec 04, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
show status of issue links in wiki page
parent
8503fec2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
2 deletions
+13
-2
app/helpers/markup_helper.rb
app/helpers/markup_helper.rb
+7
-1
changelogs/unreleased/39869_show_closed_status_of_links_to_issues_on_wiki_pages.yml
...9_show_closed_status_of_links_to_issues_on_wiki_pages.yml
+5
-0
spec/helpers/markup_helper_spec.rb
spec/helpers/markup_helper_spec.rb
+1
-1
No files found.
app/helpers/markup_helper.rb
View file @
e5430712
...
@@ -113,7 +113,13 @@ module MarkupHelper
...
@@ -113,7 +113,13 @@ module MarkupHelper
text
=
wiki_page
.
content
text
=
wiki_page
.
content
return
''
unless
text
.
present?
return
''
unless
text
.
present?
context
=
{
pipeline: :wiki
,
project:
@project
,
project_wiki:
@project_wiki
,
page_slug:
wiki_page
.
slug
}
context
=
{
pipeline: :wiki
,
project:
@project
,
project_wiki:
@project_wiki
,
page_slug:
wiki_page
.
slug
,
issuable_state_filter_enabled:
true
}
html
=
html
=
case
wiki_page
.
format
case
wiki_page
.
format
...
...
changelogs/unreleased/39869_show_closed_status_of_links_to_issues_on_wiki_pages.yml
0 → 100644
View file @
e5430712
---
title
:
show status of gitlab reference links in wiki
merge_request
:
15694
author
:
haseebeqx
type
:
added
spec/helpers/markup_helper_spec.rb
View file @
e5430712
...
@@ -205,7 +205,7 @@ describe MarkupHelper do
...
@@ -205,7 +205,7 @@ describe MarkupHelper do
it
"uses Wiki pipeline for markdown files"
do
it
"uses Wiki pipeline for markdown files"
do
allow
(
@wiki
).
to
receive
(
:format
).
and_return
(
:markdown
)
allow
(
@wiki
).
to
receive
(
:format
).
and_return
(
:markdown
)
expect
(
helper
).
to
receive
(
:markdown_unsafe
).
with
(
'wiki content'
,
pipeline: :wiki
,
project:
project
,
project_wiki:
@wiki
,
page_slug:
"nested/page"
)
expect
(
helper
).
to
receive
(
:markdown_unsafe
).
with
(
'wiki content'
,
pipeline: :wiki
,
project:
project
,
project_wiki:
@wiki
,
page_slug:
"nested/page"
,
issuable_state_filter_enabled:
true
)
helper
.
render_wiki_content
(
@wiki
)
helper
.
render_wiki_content
(
@wiki
)
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