summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-12-04 16:27:47 +0000
committerRobert Speicher <robert@gitlab.com>2017-12-04 16:27:47 +0000
commit8f9622bb5ab96bf21798ae1b960b3c969db15e5d (patch)
tree2531f77b4e298abd9bda44ab950bfdf16826f427
parent8503fec2b68d9efee062f8e19089aa4e792c4903 (diff)
parente54307121feeced84de7d278bc8deb44343d9b3d (diff)
downloadgitlab-ce-8f9622bb5ab96bf21798ae1b960b3c969db15e5d.tar.gz
Merge branch '39869_show_closed_status_of_links_to_issues_on_wiki_pages' into 'master'
Show status of issuable links in wiki pages See merge request gitlab-org/gitlab-ce!15694
-rw-r--r--app/helpers/markup_helper.rb8
-rw-r--r--changelogs/unreleased/39869_show_closed_status_of_links_to_issues_on_wiki_pages.yml5
-rw-r--r--spec/helpers/markup_helper_spec.rb2
3 files changed, 13 insertions, 2 deletions
diff --git a/app/helpers/markup_helper.rb b/app/helpers/markup_helper.rb
index 9d269cb65d6..1e4be2d4bcf 100644
--- a/app/helpers/markup_helper.rb
+++ b/app/helpers/markup_helper.rb
@@ -113,7 +113,13 @@ module MarkupHelper
text = wiki_page.content
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 =
case wiki_page.format
diff --git a/changelogs/unreleased/39869_show_closed_status_of_links_to_issues_on_wiki_pages.yml b/changelogs/unreleased/39869_show_closed_status_of_links_to_issues_on_wiki_pages.yml
new file mode 100644
index 00000000000..cd31ed463a2
--- /dev/null
+++ b/changelogs/unreleased/39869_show_closed_status_of_links_to_issues_on_wiki_pages.yml
@@ -0,0 +1,5 @@
+---
+title: show status of gitlab reference links in wiki
+merge_request: 15694
+author: haseebeqx
+type: added
diff --git a/spec/helpers/markup_helper_spec.rb b/spec/helpers/markup_helper_spec.rb
index 62ea6d48542..ba0039f3a11 100644
--- a/spec/helpers/markup_helper_spec.rb
+++ b/spec/helpers/markup_helper_spec.rb
@@ -205,7 +205,7 @@ describe MarkupHelper do
it "uses Wiki pipeline for markdown files" do
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)
end